From e5b25442d4dc08474413ac1cd3e9f3faa2f31b06 Mon Sep 17 00:00:00 2001 From: Ilya Dryomov Date: Sun, 10 Dec 2023 17:01:24 +0100 Subject: [PATCH] test/pybind/rbd: don't ignore from_snapshot in check_diff() Despite the test in test_diff_iterate() being correct, it started failing: > check_diff(self.image, 0, IMG_SIZE, 'snap1', [(0, 512, False)]) ... a = [], b = [(0, 512, False)] ... > assert a == b E AssertionError This is because check_diff() drops 'snap1' argument on the floor and passes None to image.diff_iterate() instead. This goes back to 2013, see commit e88fe3cbbc8f ("rbd.py: add some missing functions"). Signed-off-by: Ilya Dryomov (cherry picked from commit f8ced6d1fe667864bee224104c23b62a2c1c0bfc) --- src/test/pybind/test_rbd.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/pybind/test_rbd.py b/src/test/pybind/test_rbd.py index d1f4d70ecbd27..9752e9424a91e 100644 --- a/src/test/pybind/test_rbd.py +++ b/src/test/pybind/test_rbd.py @@ -1437,7 +1437,7 @@ def check_diff(image, offset, length, from_snapshot, expected): extents = [] def cb(offset, length, exists): extents.append((offset, length, exists)) - image.diff_iterate(0, IMG_SIZE, None, cb) + image.diff_iterate(0, IMG_SIZE, from_snapshot, cb) eq(extents, expected) class TestClone(object): -- 2.39.5