apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

btrfs/048: extend _filter_btrfs_prop_error to handle additional errors

Browse Source 
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:
Jeff Mahoney
2016-06-27 16:14:11 -04:00
committed by Eryu Guan
parent 73f9e47abd
commit 2831b8b43b
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter.btrfs
+7 -3
View File
@@ -72,15 +72,19 @@ _filter_btrfs_compress_property()
sed -e "s/compression=\(lzo\|zlib\)/COMPRESSION=XXX/g"
}
# filter name of the property from the output, optionally verify against $1
# filter error messages from btrfs prop, optionally verify against $1
# recognized message(s):
# "object is not compatible with property: label"
# "invalid value for property:{, value}"
# "failed to {get,set} compression for $PATH[.:]: Invalid argument"
_filter_btrfs_prop_error()
{
if ! [ -z "$1" ]; then
sed -e "s/\(compatible with property\): $1/\1/"
sed -e "s#\(compatible with property\): $1#\1#" \
-e "s#^\(.*failed to [sg]et compression for $1\)[:.] \(.*\)#\1: \2#"
else
sed -e "s/^\(.*compatible with property\).*/\1/"
sed -e "s#^\(.*compatible with property\).*#\1#" \
-e "s#^\(.*invalid value for property\)[:.].*#\1#"
fi
}
tests/btrfs/048
+4 -2
View File
@@ -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
tests/btrfs/048.out
+2 -2
View File
@@ -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