| Message ID | 25e9de59bdc39f714661d8f5e7b321f6cfeff658.1676265837.git.wqu@suse.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: fixes for the cli test group | expand |
diff --git a/tests/cli-tests/017-fi-show-missing/test.sh b/tests/cli-tests/017-fi-show-missing/test.sh index 25e4c60a70e0..67757e20a898 100755 --- a/tests/cli-tests/017-fi-show-missing/test.sh +++ b/tests/cli-tests/017-fi-show-missing/test.sh @@ -23,7 +23,7 @@ run_check $SUDO_HELPER mv "$dev2" /dev/loop-non-existent run_check $SUDO_HELPER mount -o degraded $dev1 $TEST_MNT if ! run_check_stdout $SUDO_HELPER "$TOP/btrfs" filesystem show "$TEST_MNT" | \ - grep -q "$dev2 MISSING"; then + grep -q -e "devid[[:space:]]\+2.*MISSING"; then _fail "didn't find exact missing device" fi
[BUG] Test case cli/017 fails with the following errors: [TEST] cli-tests.sh [TEST/cli] 017-fi-show-missing didn't find exact missing device test failed for case 017-fi-show-missing [CAUSE] After kernel commit cb3e217bdb39 ("btrfs: use btrfs_dev_name() helper to handle missing devices better"), all dev info ioctl call on missing device would only return "<missing disk>" for its path. Thus "btrfs filesystem show" would never report detailed device path for missing disks. [FIX] Instead of relying on the device path, change the check to rely on devid instead. Now cli/017 can properly pass. Signed-off-by: Qu Wenruo <wqu@suse.com> --- tests/cli-tests/017-fi-show-missing/test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)