From 1df809144c2ed96a715c8bd3df6ed5ef48399dd3 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Sun, 23 Jun 2019 17:37:49 +0300 Subject: [PATCH] rgw/pubsub: run pubsub tests even if multisite fails Signed-off-by: Yuval Lifshitz --- qa/tasks/rgw_multisite_tests.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/qa/tasks/rgw_multisite_tests.py b/qa/tasks/rgw_multisite_tests.py index bfa90bd7650..e70f2b6d3b0 100644 --- a/qa/tasks/rgw_multisite_tests.py +++ b/qa/tasks/rgw_multisite_tests.py @@ -65,11 +65,14 @@ class RGWMultisiteTests(Task): # run nose tests in the rgw_multi.tests module conf = nose.config.Config(stream=get_log_stream(), verbosity=2) result = nose.run(defaultTest=tests.__name__, argv=argv, config=conf) + ps_result = nose.run(defaultTest=tests_ps.__name__, argv=argv, config=conf) + error_msg = '' if not result: - raise RuntimeError('rgw multisite test failures') - result = nose.run(defaultTest=tests_ps.__name__, argv=argv, config=conf) + error_msg += 'rgw multisite, ' if not result: - raise RuntimeError('rgw multisite pubsub test failures') + error_msg += 'rgw multisite pubsub, ' + if error_msg: + raise RuntimeError(error_msg + 'test failures') def get_log_stream(): -- 2.39.5