import 15.2.4

[ceph.git] / ceph / qa / tasks / rgw_multisite_tests.py

diff --git a/ceph/qa/tasks/rgw_multisite_tests.py b/ceph/qa/tasks/rgw_multisite_tests.py
index 4e6e2b3dff004af425ea602f94071c52c4d61954..53aedf79248dd8c1cfe924e744f08066b82d02fb 100644 (file)
--- a/ceph/qa/tasks/rgw_multisite_tests.py
+++ b/ceph/qa/tasks/rgw_multisite_tests.py
@@ -2,7 +2,6 @@
 rgw multisite testing
 """
 import logging
-import sys
 import nose.core
 import nose.config
 
@@ -10,10 +9,11 @@ from teuthology.exceptions import ConfigError
 from teuthology.task import Task
 from teuthology import misc
 
-from rgw_multi import multisite, tests
+from tasks.rgw_multi import multisite, tests, tests_ps
 
 log = logging.getLogger(__name__)
 
+
 class RGWMultisiteTests(Task):
     """
     Runs the rgw_multi tests against a multisite configuration created by the
@@ -63,9 +63,16 @@ class RGWMultisiteTests(Task):
 
         # run nose tests in the rgw_multi.tests module
         conf = nose.config.Config(stream=get_log_stream(), verbosity=2)
+        error_msg = ''
         result = nose.run(defaultTest=tests.__name__, argv=argv, config=conf)
         if not result:
-            raise RuntimeError('rgw multisite test failures')
+            error_msg += 'rgw multisite, '
+        result = nose.run(defaultTest=tests_ps.__name__, argv=argv, config=conf)
+        if not result:
+            error_msg += 'rgw multisite pubsub, '
+        if error_msg:
+            raise RuntimeError(error_msg + 'test failures')
+
 
 def get_log_stream():
     """ return a log stream for nose output """
@@ -88,4 +95,5 @@ def get_log_stream():
 
     return LogStream()
 
+
 task = RGWMultisiteTests