Recent btrfs-progs commit 5c91264d2dfc ("btrfs-progs: subvol delete:
print the id of the deleted subvolume") added the id of the deleted
subvolume to "Delete subvolume" print format.
As a result, btrfs/001 now always fail by the output difference.
- output mismatch (see /host/results/btrfs/001.out.bad)
--- tests/btrfs/001.out 2021-02-05 01:44:17.000000000 +0000
+++ /host/results/btrfs/001.out.bad 2023-12-15 01:43:07.000000000 +0000
@@ -33,7 +33,7 @@
Listing subvolumes
snap
subvol
-Delete subvolume 'SCRATCH_MNT/snap'
+Delete subvolume 256 (no-commit): 'SCRATCH_MNT/snap'
List root dir
subvol
...
Fix the issue by updating _filter_transaction_commit().
Reviewed-by: David Disseldorp <ddiss@xxxxxxx>
Signed-off-by: Naohiro Aota <naohiro.aota@xxxxxxx>
---
common/filter.btrfs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
v2: Fold multiple filters in single sed command, as suggested by David
Disseldorp.
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 02c6b92dfa94..8c6fe5793663 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -69,8 +69,9 @@ _filter_btrfs_device_stats()
}
_filter_transaction_commit() {
- sed -e "/Transaction commit: none (default)/d" | \
- sed -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
+ sed -e "/Transaction commit: none (default)/d" \
+ -e "s/Delete subvolume [0-9]\+ (.*commit):/Delete subvolume/g" \
+ -e "s/Delete subvolume (.*commit):/Delete subvolume/g"
}
_filter_btrfs_subvol_delete()
--
2.43.0
