From 87a10ed57ba0e8e5c41ee478cc1d12317981e41f Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Tue, 6 Sep 2022 11:44:27 +0530 Subject: [PATCH] qa: Fix test_subvolume_group_ls_filter_internal_directories Fixes: https://tracker.ceph.com/issues/57205 Signed-off-by: Kotresh HR (cherry picked from commit aafa75476722ec5d32f151004b6145d8c38d57ed) --- qa/tasks/cephfs/test_volumes.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py index 8bd027840d5..fddde25e916 100644 --- a/qa/tasks/cephfs/test_volumes.py +++ b/qa/tasks/cephfs/test_volumes.py @@ -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 -- 2.47.3