]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/dashboard/qa: Increase timeout for test_disable (tasks.mgr.dashboard.test_mgr_mod... 27187/head
authorVolker Theile <vtheile@suse.com>
Tue, 26 Mar 2019 09:06:42 +0000 (10:06 +0100)
committerVolker Theile <vtheile@suse.com>
Tue, 26 Mar 2019 14:43:54 +0000 (15:43 +0100)
Fixes: https://tracker.ceph.com/issues/38820
Signed-off-by: Volker Theile <vtheile@suse.com>
qa/tasks/mgr/dashboard/test_mgr_module.py

index 9e7d760189ca56acba543a21d5a278e511b6fa74..af0036904a30aa3ff70524e125ba1f640fbd26ea 100644 (file)
@@ -10,6 +10,8 @@ logger = logging.getLogger(__name__)
 
 
 class MgrModuleTestCase(DashboardTestCase):
+    MGRS_REQUIRED = 1
+
     @classmethod
     def tearDownClass(cls):
         cls._ceph_cmd(['mgr', 'module', 'disable', 'telemetry'])
@@ -30,7 +32,7 @@ class MgrModuleTestCase(DashboardTestCase):
                 pass
             return False
 
-        self.wait_until_true(_check_connection, timeout=20, period=2)
+        self.wait_until_true(_check_connection, timeout=30)
 
 
 class MgrModuleTest(MgrModuleTestCase):
@@ -171,6 +173,8 @@ class MgrModuleTelemetryTest(MgrModuleTestCase):
         self.assertTrue(module_info['enabled'])
 
     def test_disable(self):
+        # Enable the 'telemetry' module (all CephMgr modules are restarted)
+        # and wait until the Dashboard REST API is accessible.
         self._ceph_cmd(['mgr', 'module', 'enable', 'telemetry'])
         self.wait_until_rest_api_accessible()
         try: