From 78244334ad0f24615e4ae07672fb16fe090d9c75 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 14 Feb 2020 20:31:25 +0800 Subject: [PATCH] qa/tasks: call super class's setUp() to address the regression introduced by 87292811215f6ded9a784d3216a910faaef648e2 Signed-off-by: Kefu Chai (cherry picked from commit 7d262db1145a14a73da481acba66e51b5f30e4af) --- qa/tasks/mgr/dashboard/helper.py | 1 + qa/tasks/mgr/dashboard/test_auth.py | 1 + qa/tasks/mgr/dashboard/test_rgw.py | 1 + qa/tasks/mgr/dashboard/test_settings.py | 1 + qa/tasks/mgr/test_crash.py | 1 + qa/tasks/mgr/test_failover.py | 1 + qa/tasks/mgr/test_insights.py | 1 + qa/tasks/mgr/test_module_selftest.py | 1 + qa/tasks/mgr/test_progress.py | 1 + qa/tasks/mgr/test_prometheus.py | 1 + 10 files changed, 10 insertions(+) diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py index 41bf2153b0738..854c85096bec8 100644 --- a/qa/tasks/mgr/dashboard/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -149,6 +149,7 @@ class DashboardTestCase(MgrTestCase): cls.login('admin', 'admin') def setUp(self): + super(DashboardTestCase, self).setUp() if not self._loggedin and self.AUTO_AUTHENTICATE: self.login('admin', 'admin') self.wait_for_health_clear(20) diff --git a/qa/tasks/mgr/dashboard/test_auth.py b/qa/tasks/mgr/dashboard/test_auth.py index 0de3f27812075..0acc64478d17d 100644 --- a/qa/tasks/mgr/dashboard/test_auth.py +++ b/qa/tasks/mgr/dashboard/test_auth.py @@ -14,6 +14,7 @@ class AuthTest(DashboardTestCase): AUTO_AUTHENTICATE = False def setUp(self): + super(AuthTest, self).setUp() self.reset_session() def _validate_jwt_token(self, token, username, permissions): diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py index dc119b3002bd7..5c41b207e11f0 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -67,6 +67,7 @@ class RgwApiCredentialsTest(RgwTestCase): AUTH_ROLES = ['rgw-manager'] def setUp(self): + super(RgwApiCredentialsTest, self).setUp() # Restart the Dashboard module to ensure that the connection to the # RGW Admin Ops API is re-established with the new credentials. self.logout() diff --git a/qa/tasks/mgr/dashboard/test_settings.py b/qa/tasks/mgr/dashboard/test_settings.py index bc0925df223b5..2d890484a3e04 100644 --- a/qa/tasks/mgr/dashboard/test_settings.py +++ b/qa/tasks/mgr/dashboard/test_settings.py @@ -7,6 +7,7 @@ from .helper import DashboardTestCase, JList, JObj, JAny class SettingsTest(DashboardTestCase): def setUp(self): + super(SettingsTest, self).setUp() self.settings = self._get('/api/settings') def tearDown(self): diff --git a/qa/tasks/mgr/test_crash.py b/qa/tasks/mgr/test_crash.py index cb5c7af76fad0..49191127f24b4 100644 --- a/qa/tasks/mgr/test_crash.py +++ b/qa/tasks/mgr/test_crash.py @@ -13,6 +13,7 @@ DATEFMT = '%Y-%m-%d %H:%M:%S.%f' class TestCrash(MgrTestCase): def setUp(self): + super(TestCrash, self).setUp() self.setup_mgrs() self._load_module('crash') diff --git a/qa/tasks/mgr/test_failover.py b/qa/tasks/mgr/test_failover.py index 5e1d842d52f7d..a4e840883f90d 100644 --- a/qa/tasks/mgr/test_failover.py +++ b/qa/tasks/mgr/test_failover.py @@ -12,6 +12,7 @@ class TestFailover(MgrTestCase): MGRS_REQUIRED = 2 def setUp(self): + super(TestFailover, self).setUp() self.setup_mgrs() def test_timeout(self): diff --git a/qa/tasks/mgr/test_insights.py b/qa/tasks/mgr/test_insights.py index 22e3abfcfe3a1..53a98b9c679b2 100644 --- a/qa/tasks/mgr/test_insights.py +++ b/qa/tasks/mgr/test_insights.py @@ -12,6 +12,7 @@ DATEFMT = '%Y-%m-%d %H:%M:%S.%f' class TestInsights(MgrTestCase): def setUp(self): + super(TestInsights, self).setUp() self.setup_mgrs() self._load_module("insights") self._load_module("selftest") diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py index 2670347077580..3c36a6ebb695b 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -24,6 +24,7 @@ class TestModuleSelftest(MgrTestCase): MGRS_REQUIRED = 1 def setUp(self): + super(TestModuleSelftest, self).setUp() self.setup_mgrs() def _selftest_plugin(self, module_name): diff --git a/qa/tasks/mgr/test_progress.py b/qa/tasks/mgr/test_progress.py index 35039f2d0c305..dad329a06f398 100644 --- a/qa/tasks/mgr/test_progress.py +++ b/qa/tasks/mgr/test_progress.py @@ -61,6 +61,7 @@ class TestProgress(MgrTestCase): return len(osd_map['osds']) def setUp(self): + super(TestProgress, self).setUp() # Ensure we have at least four OSDs if self._osd_count() < 4: raise SkipTest("Not enough OSDS!") diff --git a/qa/tasks/mgr/test_prometheus.py b/qa/tasks/mgr/test_prometheus.py index e8292b4a2b26a..63a4abe00dbba 100644 --- a/qa/tasks/mgr/test_prometheus.py +++ b/qa/tasks/mgr/test_prometheus.py @@ -11,6 +11,7 @@ class TestPrometheus(MgrTestCase): MGRS_REQUIRED = 3 def setUp(self): + super(TestPrometheus, self).setUp() self.setup_mgrs() def test_file_sd_command(self): -- 2.39.5