diff options
| author | Soren Hansen <soren@linux2go.dk> | 2011-03-17 14:51:59 +0100 |
|---|---|---|
| committer | Soren Hansen <soren@linux2go.dk> | 2011-03-17 14:51:59 +0100 |
| commit | 27d5cbaf03e532e30de2b6aacbc330391a0d1735 (patch) | |
| tree | 1f00f295b5fb26d6e43dc6fcd042b1c53c16845d | |
| parent | 699abfe9e645ddbc854b42725247ab8fcd61517e (diff) | |
| download | nova-27d5cbaf03e532e30de2b6aacbc330391a0d1735.tar.gz nova-27d5cbaf03e532e30de2b6aacbc330391a0d1735.tar.xz nova-27d5cbaf03e532e30de2b6aacbc330391a0d1735.zip | |
Make smoketests' exit code reveal whether they were succesful.
| -rw-r--r-- | smoketests/admin_smoketests.py | 2 | ||||
| -rw-r--r-- | smoketests/base.py | 9 | ||||
| -rw-r--r-- | smoketests/netadmin_smoketests.py | 2 | ||||
| -rw-r--r-- | smoketests/public_network_smoketests.py | 2 | ||||
| -rw-r--r-- | smoketests/sysadmin_smoketests.py | 2 |
5 files changed, 11 insertions, 6 deletions
diff --git a/smoketests/admin_smoketests.py b/smoketests/admin_smoketests.py index 86a7f600d..8d8b4349e 100644 --- a/smoketests/admin_smoketests.py +++ b/smoketests/admin_smoketests.py @@ -95,4 +95,4 @@ class UserTests(AdminSmokeTestCase): if __name__ == "__main__": suites = {'user': unittest.makeSuite(UserTests)} - sys.exit(base.run_tests(suites)) + sys.exit(not base.run_tests(suites)) diff --git a/smoketests/base.py b/smoketests/base.py index 204b4a1eb..11f67ed6f 100644 --- a/smoketests/base.py +++ b/smoketests/base.py @@ -205,7 +205,12 @@ def run_tests(suites): ', '.join(suites.keys()) return 1 - unittest.TextTestRunner(verbosity=2).run(suite) + return unittest.TextTestRunner(verbosity=2).run(suite).wasSuccessful() else: + successful = True 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 + diff --git a/smoketests/netadmin_smoketests.py b/smoketests/netadmin_smoketests.py index 38beb8fdc..4aa97c4e2 100644 --- a/smoketests/netadmin_smoketests.py +++ b/smoketests/netadmin_smoketests.py @@ -191,4 +191,4 @@ if __name__ == "__main__": suites = {'address': unittest.makeSuite(AddressTests), 'security_group': unittest.makeSuite(SecurityGroupTests) } - sys.exit(base.run_tests(suites)) + sys.exit(not base.run_tests(suites)) diff --git a/smoketests/public_network_smoketests.py b/smoketests/public_network_smoketests.py index 5a4c67642..8a2ae3379 100644 --- a/smoketests/public_network_smoketests.py +++ b/smoketests/public_network_smoketests.py @@ -184,4 +184,4 @@ class InstanceTestsFromPublic(base.UserSmokeTestCase): if __name__ == "__main__": suites = {'instance': unittest.makeSuite(InstanceTestsFromPublic)} - sys.exit(base.run_tests(suites)) + sys.exit(not base.run_tests(suites)) diff --git a/smoketests/sysadmin_smoketests.py b/smoketests/sysadmin_smoketests.py index e3b84d3d3..6648ae7cf 100644 --- a/smoketests/sysadmin_smoketests.py +++ b/smoketests/sysadmin_smoketests.py @@ -290,4 +290,4 @@ if __name__ == "__main__": 'instance': unittest.makeSuite(InstanceTests), 'volume': unittest.makeSuite(VolumeTests) } - sys.exit(base.run_tests(suites)) + sys.exit(not base.run_tests(suites)) |