import ceph quincy 17.2.1

[ceph.git] / ceph / qa / tasks / cephadm_cases / test_cli.py

diff --git a/ceph/qa/tasks/cephadm_cases/test_cli.py b/ceph/qa/tasks/cephadm_cases/test_cli.py
index c05395673c878222aa9b438b5f550325b7d9f671..ca40a8cdb0f8870b3ca943aea16c9c6285299ec9 100644 (file)
--- a/ceph/qa/tasks/cephadm_cases/test_cli.py
+++ b/ceph/qa/tasks/cephadm_cases/test_cli.py
@@ -44,14 +44,14 @@ class TestCephadmCLI(MgrTestCase):
 
     def test_pause(self):
         self._orch_cmd('pause')
-        self.wait_for_health('CEPHADM_PAUSED', 30)
+        self.wait_for_health('CEPHADM_PAUSED', 60)
         self._orch_cmd('resume')
-        self.wait_for_health_clear(30)
+        self.wait_for_health_clear(60)
 
     def test_daemon_restart(self):
         self._orch_cmd('daemon', 'stop', 'osd.0')
-        self.wait_for_health('OSD_DOWN', 30)
-        with safe_while(sleep=1, tries=30) as proceed:
+        self.wait_for_health('OSD_DOWN', 60)
+        with safe_while(sleep=2, tries=30) as proceed:
             while proceed():
                 j = json.loads(self._orch_cmd('ps', '--format', 'json'))
                 d = {d['daemon_name']: d for d in j}
@@ -59,7 +59,7 @@ class TestCephadmCLI(MgrTestCase):
                     break
         time.sleep(5)
         self._orch_cmd('daemon', 'start', 'osd.0')
-        self.wait_for_health_clear(90)
+        self.wait_for_health_clear(120)
         self._orch_cmd('daemon', 'restart', 'osd.0')
 
     def test_device_ls_wide(self):
@@ -67,7 +67,7 @@ class TestCephadmCLI(MgrTestCase):
 
     def test_cephfs_mirror(self):
         self._orch_cmd('apply', 'cephfs-mirror')
-        self.wait_until_true(lambda: 'cephfs-mirror' in self._orch_cmd('ps'), 30)
-        self.wait_for_health_clear(30)
+        self.wait_until_true(lambda: 'cephfs-mirror' in self._orch_cmd('ps'), 60)
+        self.wait_for_health_clear(60)
         self._orch_cmd('rm', 'cephfs-mirror')
-        self.wait_until_true(lambda: 'cephfs-mirror' not in self._orch_cmd('ps'), 30)
+        self.wait_until_true(lambda: 'cephfs-mirror' not in self._orch_cmd('ps'), 60)