Add system's requirements.txt, enforce flake8 linter

Fix style issues in functional tests.
This commit is contained in:
Andrey Smirnov
2017-04-27 18:58:15 +03:00
parent 7a7b981d4f
commit c798db8056
44 changed files with 334 additions and 260 deletions

View File

@@ -22,6 +22,16 @@ except ImportError:
return s
def walk_modules(package):
yield importlib.import_module(package)
for name in glob.glob(package + "/*.py"):
name = os.path.splitext(os.path.basename(name))[0]
if name == "__init__":
continue
yield importlib.import_module(package + "." + name)
def run(include_long_tests=False, capture_results=False, tests=None, filters=None):
"""
Run system test.
@@ -33,54 +43,52 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
lastBase = None
for test in tests:
for testModule in walk_modules(test):
for name in dir(testModule):
o = getattr(testModule, name)
testModule = importlib.import_module(test)
for name in dir(testModule):
o = getattr(testModule, name)
if not (inspect.isclass(o) and issubclass(o, BaseTest) and o is not BaseTest and
o is not SwiftTest and o is not S3Test and o is not APITest and o is not FileSystemEndpointTest):
continue
newBase = o.__bases__[0]
if lastBase is not None and lastBase is not newBase:
lastBase.shutdown_class()
lastBase = newBase
if filters:
matches = False
for filt in filters:
if fnmatch.fnmatch(o.__name__, filt):
matches = True
break
if not matches:
if not (inspect.isclass(o) and issubclass(o, BaseTest) and o is not BaseTest and
o is not SwiftTest and o is not S3Test and o is not APITest and o is not FileSystemEndpointTest):
continue
t = o()
if t.longTest and not include_long_tests or not t.fixture_available():
numSkipped += 1
continue
newBase = o.__bases__[0]
if lastBase is not None and lastBase is not newBase:
lastBase.shutdown_class()
numTests += 1
lastBase = newBase
sys.stdout.write("%s:%s... " % (test, o.__name__))
if filters:
matches = False
try:
t.captureResults = capture_results
t.test()
except BaseException:
numFailed += 1
typ, val, tb = sys.exc_info()
fails.append((test, t, typ, val, tb, testModule))
sys.stdout.write(colored("FAIL\n", color="red"))
else:
sys.stdout.write(colored("OK\n", color="green"))
for filt in filters:
if fnmatch.fnmatch(o.__name__, filt):
matches = True
break
t.shutdown()
if not matches:
continue
t = o()
if t.longTest and not include_long_tests or not t.fixture_available():
numSkipped += 1
continue
numTests += 1
sys.stdout.write("%s:%s... " % (test, o.__name__))
try:
t.captureResults = capture_results
t.test()
except BaseException:
numFailed += 1
typ, val, tb = sys.exc_info()
fails.append((test, t, typ, val, tb, testModule))
sys.stdout.write(colored("FAIL\n", color="red"))
else:
sys.stdout.write(colored("OK\n", color="green"))
t.shutdown()
if lastBase is not None:
lastBase.shutdown_class()
@@ -91,13 +99,13 @@ def run(include_long_tests=False, capture_results=False, tests=None, filters=Non
print "\nFAILURES (%d):" % (len(fails), )
for (test, t, typ, val, tb, testModule) in fails:
print "%s:%s %s" % (test, t.__class__.__name__, testModule.__doc__.strip() + ": " + t.__doc__.strip())
#print "ERROR: %s" % (val, )
print "%s:%s %s" % (test, t.__class__.__name__, getattr(testModule, "__doc__", "").strip() + ": " + t.__doc__.strip())
traceback.print_exception(typ, val, tb)
print "=" * 60
sys.exit(1)
if __name__ == "__main__":
if 'APTLY_VERSION' not in os.environ:
try: