Make smoketests' exit code reveal whether they were succesful.
This commit is contained in:
parent
699abfe9e6
commit
27d5cbaf03
|
@ -95,4 +95,4 @@ class UserTests(AdminSmokeTestCase):
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
suites = {'user': unittest.makeSuite(UserTests)}
|
suites = {'user': unittest.makeSuite(UserTests)}
|
||||||
sys.exit(base.run_tests(suites))
|
sys.exit(not base.run_tests(suites))
|
||||||
|
|
|
@ -205,7 +205,12 @@ def run_tests(suites):
|
||||||
', '.join(suites.keys())
|
', '.join(suites.keys())
|
||||||
return 1
|
return 1
|
||||||
|
|
||||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
return unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful()
|
||||||
else:
|
else:
|
||||||
|
successful = True
|
||||||
for suite in suites.itervalues():
|
for suite in suites.itervalues():
|
||||||
unittest.TextTestRunner(verbosity=2).run(suite)
|
result = unittest.TextTestRunner(verbosity=2).run(suite)
|
||||||
|
if not result.wasSuccesful():
|
||||||
|
successful = False
|
||||||
|
return successful
|
||||||
|
|
||||||
|
|
|
@ -191,4 +191,4 @@ if __name__ == "__main__":
|
||||||
suites = {'address': unittest.makeSuite(AddressTests),
|
suites = {'address': unittest.makeSuite(AddressTests),
|
||||||
'security_group': unittest.makeSuite(SecurityGroupTests)
|
'security_group': unittest.makeSuite(SecurityGroupTests)
|
||||||
}
|
}
|
||||||
sys.exit(base.run_tests(suites))
|
sys.exit(not base.run_tests(suites))
|
||||||
|
|
|
@ -184,4 +184,4 @@ class InstanceTestsFromPublic(base.UserSmokeTestCase):
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
suites = {'instance': unittest.makeSuite(InstanceTestsFromPublic)}
|
suites = {'instance': unittest.makeSuite(InstanceTestsFromPublic)}
|
||||||
sys.exit(base.run_tests(suites))
|
sys.exit(not base.run_tests(suites))
|
||||||
|
|
|
@ -290,4 +290,4 @@ if __name__ == "__main__":
|
||||||
'instance': unittest.makeSuite(InstanceTests),
|
'instance': unittest.makeSuite(InstanceTests),
|
||||||
'volume': unittest.makeSuite(VolumeTests)
|
'volume': unittest.makeSuite(VolumeTests)
|
||||||
}
|
}
|
||||||
sys.exit(base.run_tests(suites))
|
sys.exit(not base.run_tests(suites))
|
||||||
|
|
Loading…
Reference in New Issue