From: Kotresh HR <khiremat@redhat.com>
Date: Fri, 11 Aug 2023 08:46:16 +0000 (+0530)
Subject: qa: Wait for purge to complete in test_volume_info_pending_subvol_deletions
X-Git-Tag: v17.2.8~624^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fcae053ee551d38d0e996dae12df7af2083f69df;p=ceph.git

qa: Wait for purge to complete in test_volume_info_pending_subvol_deletions

Fixes: https://tracker.ceph.com/issues/62278
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 72125396d401e87f43534f54e9dfac0c887bf093)
---

diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py
index ecbba75c979f..6161abe2ef82 100644
--- a/qa/tasks/cephfs/test_volumes.py
+++ b/qa/tasks/cephfs/test_volumes.py
@@ -668,14 +668,16 @@ class TestVolumes(TestVolumesHelper):
         subvolname = self._generate_random_subvolume_name()
         # create subvolume
         self._fs_cmd("subvolume", "create", self.volname, subvolname, "--mode=777")
-        # create 3K files of 0.1MB
-        self._do_subvolume_io(subvolname, number_of_files=3000, file_size=0.1)
+        # create 3K zero byte files
+        self._do_subvolume_io(subvolname, number_of_files=3000, file_size=0)
         # Delete the subvolume
         self._fs_cmd("subvolume", "rm", self.volname, subvolname)
         # get volume metadata
         vol_info = json.loads(self._get_volume_info(self.volname))
         self.assertNotEqual(vol_info['pending_subvolume_deletions'], 0,
                             "pending_subvolume_deletions should be 1")
+        # verify trash dir is clean
+        self._wait_for_trash_empty()
 
     def test_volume_info_without_subvolumegroup(self):
         """