Skip to contentSkip to conversation

btrfs/177: Adjust resize output message

PATCH Superseded Marcos Paulo de Souza 2 participants 2 messages Jul 26, 2021 Btrfs file system

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs/177: Adjust resize output message

Commit 78aa1d95dd99 ("btrfs-progs: fi resize: make output more readable") added the device id of the resized fs along with a pretty printed size. Adjust the expected output of the test.

---
 tests/btrfs/177.out | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tests/btrfs/177.out +2 -2
index 63aca0e5..b1cc5db0 100644
@@ -1,4 +1,4 @@
 QA output created by 177
-Resize 'SCRATCH_MNT' of '3221225472'
+Resize device id 1 (SCRATCH_DEV) from 1.00GiB to 3.00GiB
 Text file busy
-Resize 'SCRATCH_MNT' of '1073741824'
+Resize device id 1 (SCRATCH_DEV) from 3.00GiB to 1.00GiB
Signature · 1 line
2.26.2
#1 lore raw
Quoted 14 lines · Marcos Paulo de Souza

Commit 78aa1d95dd99 ("btrfs-progs: fi resize: make output more readable") added the device id of the resized fs along with a pretty printed size. Adjust the expected output of the test.

---
  tests/btrfs/177.out | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
tests/btrfs/177.out +0 -0
index 63aca0e5..b1cc5db0 100644

tests/btrfs/177.out line 4

Quoted 6 lines
tests/btrfs/177.out +2 -2
@@ -1,4 +1,4 @@
  QA output created by 177
-Resize 'SCRATCH_MNT' of '3221225472'
+Resize device id 1 (SCRATCH_DEV) from 1.00GiB to 3.00GiB
  Text file busy
-Resize 'SCRATCH_MNT' of '1073741824'
+Resize device id 1 (SCRATCH_DEV) from 3.00GiB to 1.00GiB

This will make older btrfs-progs fail the test.

IMHO the proper way is to introduce a filter to handle both output format.

Thanks,
Qu

Quoted 1 line