btrfs/163: Fix recently broken test
PATCH 1/1 btrfs/163: Fix recently broken test
Upstream commit "btrfs: fix replace of seed device" broke btrfs/163 as it disallowed replacing the seed device. Update the test to account for this change in behavior.
Signed-off-by Nikolay Borisov <[email protected]>
---
That commit still hasn't landed into upstream master but it's in misc-next hence I discovered the failures. I guess this is really a heads up and will have to be resubmitted when the commit is sent for upstream inclusion.
tests/btrfs/163 | 13 +++++-------- tests/btrfs/163.out | 4 ---- 2 files changed, 5 insertions(+), 12 deletions(-)
tests/btrfs/163 +5 -8
@@ -4,7 +4,7 @@ # # FS QA Test 163 # -# Test case to verify that a seed device can be replaced +# Test case to verify that a seed device cannot be replaced # Create a seed device # Create a sprout device # Remount RW
@@ -68,14 +68,11 @@ add_sprout() replace_seed() { - _run_btrfs_util_prog replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT - _run_btrfs_util_prog filesystem show -m $SCRATCH_MNT - _scratch_unmount - run_check _mount $dev_replace_tgt $SCRATCH_MNT - echo -- sprout -- - od -x $SCRATCH_MNT/foobar + $BTRFS_UTIL_PROG replace start -fB $dev_seed $dev_replace_tgt $SCRATCH_MNT &> /dev/null + if [ $? -ne 1 ]; then + _fail "replace should have failed" + fi _scratch_unmount - } seed_is_mountable()
tests/btrfs/163.out +0 -4
@@ -3,7 +3,3 @@ QA output created by 163 0000000 abab abab abab abab abab abab abab abab * 20000000 --- sprout -- -0000000 abab abab abab abab abab abab abab abab -* -20000000
--
2.17.1
Quoted 4 lines · Nikolay Borisov
Upstream commit "btrfs: fix replace of seed device" broke btrfs/163 as it disallowed replacing the seed device. Update the test to account for this change in behavior.
Related fix has already been submitted here
https://patchwork.kernel.org/patch/11758651/
I think Johannes already picked this.