]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
qa: Fix test_subvolume_group_ls_filter_internal_directories 48328/head
authorKotresh HR <khiremat@redhat.com>
Tue, 6 Sep 2022 06:14:27 +0000 (11:44 +0530)
committerKotresh HR <khiremat@redhat.com>
Sat, 1 Oct 2022 07:38:23 +0000 (13:08 +0530)
Fixes: https://tracker.ceph.com/issues/57205
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit aafa75476722ec5d32f151004b6145d8c38d57ed)

qa/tasks/cephfs/test_volumes.py

index 8bd027840d52d011dc4f59a727e22794a2a8990d..fddde25e9166428568a2e76efc645971e99f8538 100644 (file)
@@ -1590,6 +1590,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)
 
@@ -1605,6 +1608,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