From: Venky Shankar Date: Fri, 5 Jul 2019 15:09:18 +0000 (-0400) Subject: test: cleanup removing all subvolumes before removing subvolume group X-Git-Tag: v15.1.0~2189^2~13 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ae470a64ecf8ded8bbe3dbe02b5a470fecb7e2c3;p=ceph-ci.git test: cleanup removing all subvolumes before removing subvolume group Test `test_subvolume_create_with_desired_mode_in_group()` creates three subvolume in a subvolume group. During cleanup, it only removed two of the three subvolumes. This causes failure when removing the subvolume group since it's not empty. Signed-off-by: Venky Shankar --- diff --git a/qa/tasks/cephfs/test_volumes.py b/qa/tasks/cephfs/test_volumes.py index 11857a75a3a..2634dca253b 100644 --- a/qa/tasks/cephfs/test_volumes.py +++ b/qa/tasks/cephfs/test_volumes.py @@ -250,8 +250,9 @@ class TestVolumes(CephFSTestCase): self.assertEqual(actual_mode2, expected_mode2) self.assertEqual(actual_mode3, expected_mode2) - self._fs_cmd("subvolume", "rm", self.volname, subvol2, group) self._fs_cmd("subvolume", "rm", self.volname, subvol1, group) + self._fs_cmd("subvolume", "rm", self.volname, subvol2, group) + self._fs_cmd("subvolume", "rm", self.volname, subvol3, group) self._fs_cmd("subvolumegroup", "rm", self.volname, group) def test_nonexistent_subvolme_group_rm(self):