rgw/pubsub: run pubsub tests even if multisite fails

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>

diff --git a/qa/tasks/rgw_multisite_tests.py b/qa/tasks/rgw_multisite_tests.py
index bfa90bd7650f5c96e74e207eeee1946ec89447fc..e70f2b6d3b0fa6f1a4af2fffa030d340184d765f 100644 (file)
--- 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():