From: Volker Theile <vtheile@suse.com>
Date: Tue, 26 Mar 2019 09:06:42 +0000 (+0100)
Subject: mgr/dashboard/qa: Increase timeout for test_disable (tasks.mgr.dashboard.test_mgr_mod... 
X-Git-Tag: v14.2.1~97^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=62acf61d0bbb4321f3e59e352ae4e9fb21558abb;p=ceph.git

mgr/dashboard/qa: Increase timeout for test_disable (tasks.mgr.dashboard.test_mgr_module.MgrModuleTelemetryTest)

Fixes: https://tracker.ceph.com/issues/38820

Signed-off-by: Volker Theile <vtheile@suse.com>
(cherry picked from commit 91fe2f07997d292e42005001e07dbf1dfb94d0c8)
---

diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py
index 9e7d760189ca..af0036904a30 100644
--- a/qa/tasks/mgr/dashboard/test_mgr_module.py
+++ b/qa/tasks/mgr/dashboard/test_mgr_module.py
@@ -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: