diff options
author | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-01-26 00:37:47 +0000 |
---|---|---|
committer | Dimitri John Ledkov <xnox@ubuntu.com> | 2019-01-26 00:37:47 +0000 |
commit | 2fd02b1f5f50d499b8f19d0cc5e9bc9ed7e686cd (patch) | |
tree | 7557002a8de5892b17c04d1afcd8fdc99a0af4e7 /libbtrfsutil/python/tests/test_subvolume.py | |
parent | 03b9f8baf40383f4c2d709c656ca35bd75362dff (diff) |
New upstream release
Diffstat (limited to 'libbtrfsutil/python/tests/test_subvolume.py')
-rw-r--r-- | libbtrfsutil/python/tests/test_subvolume.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libbtrfsutil/python/tests/test_subvolume.py b/libbtrfsutil/python/tests/test_subvolume.py index 99ec97bc..b06a1d3d 100644 --- a/libbtrfsutil/python/tests/test_subvolume.py +++ b/libbtrfsutil/python/tests/test_subvolume.py @@ -168,12 +168,13 @@ class TestSubvolume(BtrfsTestCase): with drop_privs(): try: - self._test_subvolume_info(subvol, snapshot) + btrfsutil.subvolume_info(self.mountpoint) except OSError as e: if e.errno == errno.ENOTTY: self.skipTest('BTRFS_IOC_GET_SUBVOL_INFO is not available') else: raise + self._test_subvolume_info(subvol, snapshot) def test_read_only(self): for arg in self.path_or_fd(self.mountpoint): @@ -487,6 +488,13 @@ class TestSubvolume(BtrfsTestCase): try: os.chdir(self.mountpoint) with drop_privs(): + try: + list(btrfsutil.SubvolumeIterator('.')) + except OSError as e: + if e.errno == errno.ENOTTY: + self.skipTest('BTRFS_IOC_GET_SUBVOL_ROOTREF is not available') + else: + raise self._test_subvolume_iterator() finally: os.chdir(pwd) |