]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
qa/tasks/cephfs/nfs: Poll for max 60 seconds to ensure removal of ganesha services 35646/head
authorVarsha Rao <varao@redhat.com>
Fri, 19 Jun 2020 09:00:22 +0000 (14:30 +0530)
committerVarsha Rao <varao@redhat.com>
Mon, 22 Jun 2020 06:43:11 +0000 (12:13 +0530)
Fixes: https://tracker.ceph.com/issues/46104
Signed-off-by: Varsha Rao <varao@redhat.com>
qa/tasks/cephfs/test_nfs.py

index 850b0b736ef29044132d86710c928f2eb276a310..a2ce2382f8272ab12908fa144faf3651f05a9461 100644 (file)
@@ -64,9 +64,15 @@ class TestNFS(MgrTestCase):
 
     def _test_delete_cluster(self):
         self._nfs_cmd('cluster', 'delete', self.cluster_id)
-        time.sleep(8)
-        orch_output = self._check_nfs_status()
-        self.assertEqual("No services reported\n", orch_output)
+        expected_output = "No services reported\n"
+        wait_time = 10
+        while wait_time <= 60:
+            time.sleep(wait_time)
+            orch_output = self._check_nfs_status()
+            if expected_output == orch_output:
+                return
+            wait_time += 10
+        self.fail("NFS Ganesha cluster could not be deleted")
 
     def _create_export(self, export_id, create_fs=False, extra_cmd=None):
         if create_fs: