mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
btrfs/048: extend _filter_btrfs_prop_error to handle additional errors
btrfsprogs v4.5.3 changed the formatting of some error messages. This patch extends the filter for btrfs prop to handle those. Signed-off-by: Jeff Mahoney <jeffm@suse.com> Reviewed-by: Eryu Guan <eguan@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
+4
-2
@@ -79,7 +79,8 @@ echo -e "\nTesting subvolume ro property"
|
||||
_run_btrfs_util_prog subvolume create $SCRATCH_MNT/sv1
|
||||
$BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1 ro
|
||||
echo "***"
|
||||
$BTRFS_UTIL_PROG property set $SCRATCH_MNT/sv1 ro foo
|
||||
$BTRFS_UTIL_PROG property set $SCRATCH_MNT/sv1 ro foo 2>&1 |
|
||||
_filter_btrfs_prop_error
|
||||
echo "***"
|
||||
$BTRFS_UTIL_PROG property set $SCRATCH_MNT/sv1 ro true
|
||||
echo "***"
|
||||
@@ -99,7 +100,8 @@ $BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/file1 compression
|
||||
$BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/subdir1 compression
|
||||
echo "***"
|
||||
$BTRFS_UTIL_PROG property set $SCRATCH_MNT/testdir/file1 compression \
|
||||
foo 2>&1 | _filter_scratch
|
||||
foo 2>&1 | _filter_scratch |
|
||||
_filter_btrfs_prop_error SCRATCH_MNT/testdir/file1
|
||||
echo "***"
|
||||
$BTRFS_UTIL_PROG property set $SCRATCH_MNT/testdir/file1 compression lzo
|
||||
$BTRFS_UTIL_PROG property get $SCRATCH_MNT/testdir/file1 compression
|
||||
|
||||
+2
-2
@@ -15,7 +15,7 @@ ERROR: object is not compatible with property
|
||||
Testing subvolume ro property
|
||||
ro=false
|
||||
***
|
||||
ERROR: invalid value for property.
|
||||
ERROR: invalid value for property
|
||||
***
|
||||
***
|
||||
ro=true
|
||||
@@ -27,7 +27,7 @@ ro=false
|
||||
|
||||
Testing compression property
|
||||
***
|
||||
ERROR: failed to set compression for SCRATCH_MNT/testdir/file1. Invalid argument
|
||||
ERROR: failed to set compression for SCRATCH_MNT/testdir/file1: Invalid argument
|
||||
***
|
||||
compression=lzo
|
||||
compression=lzo
|
||||
|
||||
Reference in New Issue
Block a user