From 8362ecc7dfd8056567b74fdaaa52809082f15421 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Mon, 15 Apr 2019 14:19:45 +0300 Subject: [PATCH] rgw/pubsub: actually adding the ps tests Signed-off-by: Yuval Lifshitz --- qa/tasks/rgw_multisite_tests.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/qa/tasks/rgw_multisite_tests.py b/qa/tasks/rgw_multisite_tests.py index 4e6e2b3dff0..bfa90bd7650 100644 --- a/qa/tasks/rgw_multisite_tests.py +++ b/qa/tasks/rgw_multisite_tests.py @@ -10,10 +10,11 @@ from teuthology.exceptions import ConfigError from teuthology.task import Task from teuthology import misc -from rgw_multi import multisite, tests +from 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 @@ -66,6 +67,10 @@ class RGWMultisiteTests(Task): result = nose.run(defaultTest=tests.__name__, argv=argv, config=conf) if not result: raise RuntimeError('rgw multisite test failures') + result = nose.run(defaultTest=tests_ps.__name__, argv=argv, config=conf) + if not result: + raise RuntimeError('rgw multisite pubsub test failures') + def get_log_stream(): """ return a log stream for nose output """ @@ -88,4 +93,5 @@ def get_log_stream(): return LogStream() + task = RGWMultisiteTests -- 2.39.5