libbtrfsutil: python: add tests for new 0.1.3 aliases

Add python test cases for new aliases added in util lib version 0.1.3.
DUe to the way the tests are done the cases are copied and adjusted.
Eventually all the old versions are deleted, for now keep it intact for
test coverage.

Signed-off-by: David Sterba <[email protected]>
[ Fix a typo in self tests. ]
Signed-off-by: Qu Wenruo <[email protected]>

Author: kdave

libbtrfsutil/python/tests/test_filesystem.py

@@ -46,6 +46,17 @@ def test_sync(self):
                 self.assertGreater(new_generation, old_generation)
                 old_generation = new_generation
 
+    # Copy of test_sync
+    def test_fs_sync(self):
+        old_generation = self.super_generation()
+        for arg in self.path_or_fd(self.mountpoint):
+            with self.subTest(type=type(arg)):
+                touch(arg)
+                btrfsutil.fs_sync(arg)
+                new_generation = self.super_generation()
+                self.assertGreater(new_generation, old_generation)
+                old_generation = new_generation
+
     def test_start_sync(self):
         old_generation = self.super_generation()
         for arg in self.path_or_fd(self.mountpoint):
@@ -54,6 +65,15 @@ def test_start_sync(self):
                 transid = btrfsutil.start_sync(arg)
                 self.assertGreater(transid, old_generation)
 
+    # Copy of test_start_sync
+    def test_fs_start_sync(self):
+        old_generation = self.super_generation()
+        for arg in self.path_or_fd(self.mountpoint):
+            with self.subTest(type=type(arg)):
+                touch(arg)
+                transid = btrfsutil.fs_start_sync(arg)
+                self.assertGreater(transid, old_generation)
+
     def test_wait_sync(self):
         old_generation = self.super_generation()
         for arg in self.path_or_fd(self.mountpoint):
@@ -71,3 +91,21 @@ def test_wait_sync(self):
                 new_generation = self.super_generation()
                 self.assertGreater(new_generation, old_generation)
                 old_generation = new_generation
+
+    def test_fs_wait_sync(self):
+        old_generation = self.super_generation()
+        for arg in self.path_or_fd(self.mountpoint):
+            with self.subTest(type=type(arg)):
+                touch(arg)
+                transid = btrfsutil.fs_start_sync(arg)
+                btrfsutil.fs_wait_sync(arg, transid)
+                new_generation = self.super_generation()
+                self.assertGreater(new_generation, old_generation)
+                old_generation = new_generation
+
+                touch(arg)
+                btrfsutil.fs_start_sync(arg)
+                btrfsutil.fs_wait_sync(arg)
+                new_generation = self.super_generation()
+                self.assertGreater(new_generation, old_generation)
+                old_generation = new_generation

libbtrfsutil/python/tests/test_qgroup.py

@@ -41,6 +41,17 @@ def test_snapshot_inherit(self):
         btrfsutil.create_subvolume(subvol)
         btrfsutil.create_snapshot(subvol, snapshot, qgroup_inherit=inherit)
 
+    # Copy of test_snapshot_inherit
+    def test_snapshot_inherit(self):
+        subvol = os.path.join(self.mountpoint, 'subvol')
+        snapshot = os.path.join(self.mountpoint, 'snapshot')
+
+        inherit = btrfsutil.QgroupInherit()
+        inherit.add_group(5)
+
+        btrfsutil.subvolume_create(subvol)
+        btrfsutil.subvolume_snapshot(subvol, snapshot, qgroup_inherit=inherit)
+
 
 class TestQgroupInherit(unittest.TestCase):
     def test_new(self):