From: Kotresh HR <khiremat@redhat.com>
Date: Tue, 6 Sep 2022 06:14:27 +0000 (+0530)
Subject: qa: Fix test_subvolume_group_ls_filter_internal_directories
X-Git-Tag: v18.1.0~1108^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aafa75476722ec5d32f151004b6145d8c38d57ed;p=ceph.git

qa: Fix test_subvolume_group_ls_filter_internal_directories

Fixes: https://tracker.ceph.com/issues/57205
Signed-off-by: Kotresh HR <khiremat@redhat.com>
---

diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py
index c6dc292f147a..124d6f0b4dff 100644
--- a/qa/tasks/cephfs/test_volumes.py
+++ b/qa/tasks/cephfs/test_volumes.py
@@ -1673,6 +1673,9 @@ class TestSubvolumeGroups(TestVolumesHelper):
         # clone snapshot which will create '_index' directory
         self._fs_cmd("subvolume", "snapshot", "clone", self.volname, subvolume, snapshot, clone)
 
+        # wait for clone to complete
+        self._wait_for_clone_to_complete(clone)
+
         # remove snapshot
         self._fs_cmd("subvolume", "snapshot", "rm", self.volname, subvolume, snapshot)
 
@@ -1688,6 +1691,11 @@ class TestSubvolumeGroups(TestVolumesHelper):
 
         self.assertEqual(all(elem in subvolumegroups for elem in ret_list), True)
 
+        # cleanup
+        self._fs_cmd("subvolume", "rm", self.volname, clone)
+        for groupname in subvolumegroups:
+            self._fs_cmd("subvolumegroup", "rm", self.volname, groupname)
+
     def test_subvolume_group_ls_for_nonexistent_volume(self):
         # tests the 'fs subvolumegroup ls' command when /volume doesn't exist
         # prerequisite: we expect that the test volume is created and a subvolumegroup is NOT created