From: Kefu Chai Date: Fri, 14 Feb 2020 12:31:25 +0000 (+0800) Subject: qa/tasks: call super class's setUp() X-Git-Tag: v15.1.1~407^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33325%2Fhead;p=ceph.git qa/tasks: call super class's setUp() to address the regression introduced by 87292811215f6ded9a784d3216a910faaef648e2 Signed-off-by: Kefu Chai --- diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py index 98064962b67b..24d0f455da7e 100644 --- a/qa/tasks/mgr/dashboard/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -164,6 +164,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 44a8d0d56dfd..16536fa94e78 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 a04ee7fc6445..7976b96acb7a 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -66,6 +66,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 bc0925df223b..2d890484a3e0 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 0c751d1c98d3..97d5c349420e 100644 --- a/qa/tasks/mgr/test_crash.py +++ b/qa/tasks/mgr/test_crash.py @@ -14,6 +14,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 2437d13b7012..bdadf019bc07 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 8f0f41ceb663..3f5b9768bbeb 100644 --- a/qa/tasks/mgr/test_insights.py +++ b/qa/tasks/mgr/test_insights.py @@ -10,6 +10,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 bec2786c33d3..966a92a69773 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -23,6 +23,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 c7cdf30c5b66..18460402efb7 100644 --- a/qa/tasks/mgr/test_progress.py +++ b/qa/tasks/mgr/test_progress.py @@ -68,6 +68,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: self.skipTest("Not enough OSDS!") diff --git a/qa/tasks/mgr/test_prometheus.py b/qa/tasks/mgr/test_prometheus.py index 0f3c71d991a3..f91487174dbd 100644 --- a/qa/tasks/mgr/test_prometheus.py +++ b/qa/tasks/mgr/test_prometheus.py @@ -14,6 +14,7 @@ class TestPrometheus(MgrTestCase): MGRS_REQUIRED = 3 def setUp(self): + super(TestPrometheus, self).setUp() self.setup_mgrs() def test_file_sd_command(self):