> On 25 Apr 2019, at 8:37 AM, fdmanana@xxxxxxxxxx wrote:
>
> From: Filipe Manana <fdmanana@xxxxxxxx>
>
> The recent commit 4529b20e1aa8f9 ("btrfs/048: amend property validation
> cases"), does not properly filter the scratch device because the error
> messages are sent to stderr and not to stdout, and the pipe filter only
> gets input from the stdout of the btrfs utility. We need to redirect the
> stderr of the btrfs utility to its stdout.
>
> Further, the golden output had the path "/mnt/scratch" hardcoded, instead
> of using SCRATCH_MNT. Fix that as well.
>
> The test was failing on any setup where the scratch device is not mounted
> at "/mnt/scratch".
>
> Signed-off-by: Filipe Manana <fdmanana@xxxxxxxx>
Thanks!
Reviewed-by: Anand Jain <anand.jain@xxxxxxxxxx>
> ---
>
> V2: Fix the formatting of the patch, which was causing git apply / path to fail.
>
> tests/btrfs/048 | 10 +++++-----
> tests/btrfs/048.out | 10 +++++-----
> 2 files changed, 10 insertions(+), 10 deletions(-)
>
> diff --git a/tests/btrfs/048 b/tests/btrfs/048
> index f6de0b8c..8bb10a90 100755
> --- a/tests/btrfs/048
> +++ b/tests/btrfs/048
> @@ -208,21 +208,21 @@ touch $SCRATCH_MNT/sv1/file2
> $BTRFS_UTIL_PROG property get $SCRATCH_MNT/sv1/file2 compression
>
> echo -e "\nTesting argument validation, should fail"
> -$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' | _filter_scratch
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' 2>&1 | _filter_scratch
> echo "***"
> -$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli' | _filter_scratch
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli' 2>&1 | _filter_scratch
> echo "***"
> -$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zst' | _filter_scratch
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zst' 2>&1 | _filter_scratch
>
> echo -e "\nTesting if property is persistent across failed validation"
> $BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lzo'
> -$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli' | _filter_scratch
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli' 2>&1 | _filter_scratch
> $BTRFS_UTIL_PROG property get $SCRATCH_MNT compression
>
> echo -e "\nTesting generation is unchanged after failed validation"
> $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
> $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | grep '^generation'
> -$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' | _filter_scratch
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' 2>&1 | _filter_scratch
> $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT
> $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | grep '^generation'
>
> diff --git a/tests/btrfs/048.out b/tests/btrfs/048.out
> index 00f39bc0..16a785a6 100644
> --- a/tests/btrfs/048.out
> +++ b/tests/btrfs/048.out
> @@ -78,17 +78,17 @@ compression=lzo
> compression=lzo
>
> Testing argument validation, should fail
> -ERROR: failed to set compression for /mnt/scratch: Invalid argument
> +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
> ***
> -ERROR: failed to set compression for /mnt/scratch: Invalid argument
> +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
> ***
> -ERROR: failed to set compression for /mnt/scratch: Invalid argument
> +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
>
> Testing if property is persistent across failed validation
> -ERROR: failed to set compression for /mnt/scratch: Invalid argument
> +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
> compression=lzo
>
> Testing generation is unchanged after failed validation
> generation 7
> -ERROR: failed to set compression for /mnt/scratch: Invalid argument
> +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
> generation 7
> --
> 2.11.0
>
