Merge pull request #994 from vojtechtrefny/master_skip-subvolume-erro…

…r-check tests: Skip some checks for btrfs errors with btrfs-progs 6.6.3
storaged-project · Jan 10, 2024 · 792855e · 792855e
2 parents b318f6e + 9508950
commit 792855e
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/tests/btrfs_test.py b/tests/btrfs_test.py
@@ -209,8 +209,10 @@ def test_create_delete_subvolume(self):
         self.assertEqual(len(subvols), 1)
 
         # already there
-        with self.assertRaises(GLib.GError):
-            BlockDev.btrfs_create_subvolume(TEST_MNT, "subvol1", None)
+        version = self._get_btrfs_version()
+        if version != Version("6.6.3"):
+            with self.assertRaises(GLib.GError):
+                BlockDev.btrfs_create_subvolume(TEST_MNT, "subvol1", None)
 
         succ = BlockDev.btrfs_delete_subvolume(TEST_MNT, "subvol1", None)
         self.assertTrue(succ)
@@ -219,8 +221,9 @@ def test_create_delete_subvolume(self):
         self.assertEqual(len(subvols), 0)
 
         # already removed
-        with self.assertRaises(GLib.GError):
-            BlockDev.btrfs_delete_subvolume(TEST_MNT, "subvol1", None)
+        if version != Version("6.6.3"):
+            with self.assertRaises(GLib.GError):
+                BlockDev.btrfs_delete_subvolume(TEST_MNT, "subvol1", None)
 
         succ = BlockDev.btrfs_create_subvolume(TEST_MNT, "subvol1", None)
         self.assertTrue(succ)