ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 15:16:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fuse/runtests: added --tests, renamed --suites

Browse Source 
changed the --tests option to be --suites, as it takes a prefix, e.g. 'read'
'write' (or 'all', the default) and runs those suites which are applicable to
each implementation being tested.

added a --tests option, which takes a list of tests, e.g. 'read_file_contents'
'write_overlapping_large_writes' and runs all tests specified without regard
to whether the implementation(s) under test are declared to support them.

this is basically to allow a specific test or two to be run, saving time 
during development and debugging by not running the entire suite
This commit is contained in:
robk-tahoe 2008-10-16 07:28:36 -07:00
parent 2bcae75012
commit 5af8eeeb3d
1 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
contrib/fuse/runtests.py
View File

@ -25,6 +25,7 @@ Unit and system tests for tahoe-fuse.
import sys, os, shutil, unittest, subprocess import sys, os, shutil, unittest, subprocess
import tempfile, re, time, random, httplib, urllib import tempfile, re, time, random, httplib, urllib
#import traceback
from twisted.python import usage from twisted.python import usage
@ -57,16 +58,16 @@ implementations = {
'impl_a': dict(module=impl_a, 'impl_a': dict(module=impl_a,
mount_args=['--basedir', '%(nodedir)s', '%(mountpath)s', ], mount_args=['--basedir', '%(nodedir)s', '%(mountpath)s', ],
mount_wait=True, mount_wait=True,
tests=['read', ]), suites=['read', ]),
'impl_b': dict(module=impl_b, 'impl_b': dict(module=impl_b,
mount_args=['--basedir', '%(nodedir)s', '%(mountpath)s', ], mount_args=['--basedir', '%(nodedir)s', '%(mountpath)s', ],
mount_wait=False, mount_wait=False,
tests=['read', ]), suites=['read', ]),
'impl_c': dict(module=impl_c, 'impl_c': dict(module=impl_c,
mount_args=['--cache-timeout', '0', '--root-uri', '%(root-uri)s', mount_args=['--cache-timeout', '0', '--root-uri', '%(root-uri)s',
'--node-directory', '%(nodedir)s', '%(mountpath)s', ], '--node-directory', '%(nodedir)s', '%(mountpath)s', ],
mount_wait=True, mount_wait=True,
tests=['read', 'write', ]), suites=['read', 'write', ]),
} }
#if sys.platform == 'darwin': #if sys.platform == 'darwin':
@ -81,8 +82,11 @@ class FuseTestsOptions(usage.Options):
["implementations", None, "all", ["implementations", None, "all",
"Comma separated list of implementations to test, or 'all'" "Comma separated list of implementations to test, or 'all'"
], ],
["tests", None, "all", ["suites", None, "all",
"Comma separated list of test sets to run, or 'all'" "Comma separated list of test suites to run, or 'all'"
],
["tests", None, None,
"Comma separated list of specific tests to run"
], ],
["path-to-tahoe", None, "../../bin/tahoe", ["path-to-tahoe", None, "../../bin/tahoe",
"Which 'tahoe' script to use to create test nodes"], "Which 'tahoe' script to use to create test nodes"],
@ -100,15 +104,19 @@ class FuseTestsOptions(usage.Options):
] ]
def postOptions(self): def postOptions(self):
if self['tests'] == 'all': if self['suites'] == 'all':
self.tests = ['read', 'write'] self.suites = ['read', 'write']
# [ ] todo: deduce this from looking for test_ in dir(self) # [ ] todo: deduce this from looking for test_ in dir(self)
else: else:
self.tests = map(str.strip, self['tests'].split(',')) self.suites = map(str.strip, self['suites'].split(','))
if self['implementations'] == 'all': if self['implementations'] == 'all':
self.implementations = implementations.keys() self.implementations = implementations.keys()
else: else:
self.implementations = map(str.strip, self['implementations'].split(',')) self.implementations = map(str.strip, self['implementations'].split(','))
if self['tests']:
self.tests = map(str.strip, self['tests'].split(','))
else:
self.tests = None
### Main flow control: ### Main flow control:
def main(args): def main(args):
@ -339,13 +347,15 @@ class SystemTest (object):
failures = 0 failures = 0
testnum = 0 testnum = 0
numtests = 0 numtests = 0
tests = list(set(self.config.tests).intersection(set(iman.tests))) if self.config.tests:
tests = self.config.tests
else:
tests = list(set(self.config.suites).intersection(set(iman.suites)))
self.maybe_wait('waiting (about to run tests)') self.maybe_wait('waiting (about to run tests)')
for test in tests: for test in tests:
print 'running %r tests' % (test,) testnames = [n for n in sorted(dir(self)) if n.startswith('test_'+test)]
testnames = [n for n in sorted(dir(self)) if n.startswith('test_'+test+'_')]
numtests += len(testnames) numtests += len(testnames)
print 'found methods:', testnames print 'running %s %r tests' % (len(testnames), test,)
for testname in testnames: for testname in testnames:
testnum += 1 testnum += 1
print '\n*** Running test #%d: %s' % (testnum, testname) print '\n*** Running test #%d: %s' % (testnum, testname)
@ -358,6 +368,7 @@ class SystemTest (object):
print 'Test succeeded.' print 'Test succeeded.'
except TestFailure, f: except TestFailure, f:
print f print f
#print traceback.format_exc()
failures += 1 failures += 1
except: except:
print 'Error in test code... Cleaning up.' print 'Error in test code... Cleaning up.'
@ -693,13 +704,13 @@ class Impl_A_UnitTests (unittest.TestCase):
class ImplProcessManager(object): class ImplProcessManager(object):
debug_wait = False debug_wait = False
def __init__(self, name, module, mount_args, mount_wait, tests): def __init__(self, name, module, mount_args, mount_wait, suites):
self.name = name self.name = name
self.module = module self.module = module
self.script = module.__file__ self.script = module.__file__
self.mount_args = mount_args self.mount_args = mount_args
self.mount_wait = mount_wait self.mount_wait = mount_wait
self.tests = tests self.suites = suites
def maybe_wait(self, msg='waiting'): def maybe_wait(self, msg='waiting'):
if self.debug_wait: if self.debug_wait: