RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2025-04-11 03:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

libbtrfsutil: use top=0 as default for SubvolumeIterator()

Browse Source 
Right now, we're defaulting to top=5 (i.e, all subvolumes). The
documented default is top=0 (i.e, only beneath the given path). This is
the expected behavior. Fix it and make the test cases cover it.

Reported-by: Jonathan Lemon <bsd@fb.com>
Signed-off-by: Omar Sandoval <osandov@fb.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Omar Sandoval 2018-11-13 23:46:56 -08:00 committed by David Sterba
parent 5d64c40240
commit 563affcd42
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbtrfsutil/python/subvolume.c
View File

@ -525,7 +525,7 @@ static int SubvolumeIterator_init(SubvolumeIterator *self, PyObject *args,
static char *keywords[] = {"path", "top", "info", "post_order", NULL}; static char *keywords[] = {"path", "top", "info", "post_order", NULL};
struct path_arg path = {.allow_fd = true}; struct path_arg path = {.allow_fd = true};
enum btrfs_util_error err; enum btrfs_util_error err;
unsigned long long top = 5; unsigned long long top = 0;
int info = 0; int info = 0;
int post_order = 0; int post_order = 0;
int flags = 0; int flags = 0;

2
libbtrfsutil/python/tests/test_subvolume.py
View File

@ -353,6 +353,7 @@ class TestSubvolume(BtrfsTestCase):
with self.subTest(type=type(arg)): with self.subTest(type=type(arg)):
self.assertEqual(list(btrfsutil.SubvolumeIterator(arg)), subvols) self.assertEqual(list(btrfsutil.SubvolumeIterator(arg)), subvols)
self.assertEqual(list(btrfsutil.SubvolumeIterator('.', top=0)), subvols) self.assertEqual(list(btrfsutil.SubvolumeIterator('.', top=0)), subvols)
self.assertEqual(list(btrfsutil.SubvolumeIterator('foo', top=5)), subvols)
self.assertEqual(list(btrfsutil.SubvolumeIterator('.', post_order=True)), self.assertEqual(list(btrfsutil.SubvolumeIterator('.', post_order=True)),
[('foo/bar/baz', 258), [('foo/bar/baz', 258),
@ -365,6 +366,7 @@ class TestSubvolume(BtrfsTestCase):
] ]
self.assertEqual(list(btrfsutil.SubvolumeIterator('.', top=256)), subvols) self.assertEqual(list(btrfsutil.SubvolumeIterator('.', top=256)), subvols)
self.assertEqual(list(btrfsutil.SubvolumeIterator('foo')), subvols)
self.assertEqual(list(btrfsutil.SubvolumeIterator('foo', top=0)), subvols) self.assertEqual(list(btrfsutil.SubvolumeIterator('foo', top=0)), subvols)
os.rename('foo/bar/baz', 'baz') os.rename('foo/bar/baz', 'baz')