diff options
| author | Michael Basnight <mbasnight@gmail.com> | 2013-03-04 10:11:32 -0600 |
|---|---|---|
| committer | Michael Basnight <mbasnight@gmail.com> | 2013-03-04 10:16:10 -0600 |
| commit | 4374be7a206062226511444de39223cd3c9d3926 (patch) | |
| tree | a3ac4bb2018fac6cf8a3bb78dbb814f97d983a79 /run_tests.py | |
| parent | 44544e587a36a44c17ef609b5c2eb2e61d67d6d9 (diff) | |
| download | trove-4374be7a206062226511444de39223cd3c9d3926.tar.gz | |
Fixing run_tests.py so it emits an error upon failure.
fixes bug 1144683
Change-Id: If9ef4e53d012fed1c44ea5c099f2e750c167265d
Diffstat (limited to 'run_tests.py')
| -rw-r--r-- | run_tests.py | 67 |
1 files changed, 35 insertions, 32 deletions
diff --git a/run_tests.py b/run_tests.py index c7afb609..71701f83 100644 --- a/run_tests.py +++ b/run_tests.py @@ -94,37 +94,40 @@ def replace_poll_until(): from reddwarf.tests import util as test_utils rd_utils.poll_until = test_utils.poll_until -if __name__=="__main__": - wsgi_install() - add_support_for_localization() - replace_poll_until() - # Load Reddwarf app - # Paste file needs absolute path - config_file = os.path.realpath('etc/reddwarf/reddwarf.conf.test') - # 'etc/reddwarf/test-api-paste.ini' - app = initialize_reddwarf(config_file) - # Initialize sqlite database. - initialize_database() - # Swap out WSGI, httplib, and several sleep functions with test doubles. - initialize_fakes(app) - # Initialize the test configuration. - CONFIG.load_from_file('etc/tests/localhost.test.conf') - - from reddwarf.tests.api import flavors - from reddwarf.tests.api import versions - from reddwarf.tests.api import instances - from reddwarf.tests.api import instances_actions - from reddwarf.tests.api import instances_delete - from reddwarf.tests.api import instances_mysql_down - from reddwarf.tests.api import instances_resize - from reddwarf.tests.api import databases - from reddwarf.tests.api import root - from reddwarf.tests.api import users - from reddwarf.tests.api import user_access - from reddwarf.tests.api.mgmt import accounts - from reddwarf.tests.api.mgmt import admin_required - from reddwarf.tests.api.mgmt import instances - from reddwarf.tests.api.mgmt import instances_actions - from reddwarf.tests.api.mgmt import storage +if __name__ == "__main__": + try: + wsgi_install() + add_support_for_localization() + replace_poll_until() + # Load Reddwarf app + # Paste file needs absolute path + config_file = os.path.realpath('etc/reddwarf/reddwarf.conf.test') + # 'etc/reddwarf/test-api-paste.ini' + app = initialize_reddwarf(config_file) + # Initialize sqlite database. + initialize_database() + # Swap out WSGI, httplib, and several sleep functions with test doubles. + initialize_fakes(app) + # Initialize the test configuration. + CONFIG.load_from_file('etc/tests/localhost.test.conf') + + from reddwarf.tests.api import flavors + from reddwarf.tests.api import versions + from reddwarf.tests.api import instances + from reddwarf.tests.api import instances_actions + from reddwarf.tests.api import instances_delete + from reddwarf.tests.api import instances_mysql_down + from reddwarf.tests.api import instances_resize + from reddwarf.tests.api import databases + from reddwarf.tests.api import root + from reddwarf.tests.api import users + from reddwarf.tests.api import user_access + from reddwarf.tests.api.mgmt import accounts + from reddwarf.tests.api.mgmt import admin_required + from reddwarf.tests.api.mgmt import instances + from reddwarf.tests.api.mgmt import instances_actions + from reddwarf.tests.api.mgmt import storage + except Exception, e: + print "Run tests failed %s" % e.msg proboscis.TestProgram().run_and_exit() |