| Message ID | 20190606100754.14575-1-jthumshirn@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs: add validation of compression options to btrfs/048 | expand |
On Thu, Jun 6, 2019 at 11:10 AM Johannes Thumshirn <jthumshirn@suse.de> wrote: > > The current btrfs/048 test-case did not check the behavior of properties > with options like compression and with the compression level supplied. > > Add test cases for compression with compression level as well so we can be > sure we don't regress there. > > Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > --- > tests/btrfs/048 | 15 +++++++++++++++ > tests/btrfs/048.out | 12 ++++++++++++ > 2 files changed, 27 insertions(+) > > diff --git a/tests/btrfs/048 b/tests/btrfs/048 > index 8bb10a904bc9..af2d4ff34414 100755 > --- a/tests/btrfs/048 > +++ b/tests/btrfs/048 > @@ -226,5 +226,20 @@ $BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' 2>&1 | _filter_scrat > $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT > $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | grep '^generation' > > +echo -e "\nTesting argument validation with options" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lzo:9' 2>&1 | _filter_scratch > +echo "***" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zlib:3' 2>&1 | _filter_scratch > +echo "***" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zstd:0' 2>&1 | _filter_scratch > +echo "***" For those 3 cases, there's no need to "2>&1 | _filter_scratch", since we don't expect any output from the commands in the golden output. Other than that, looks good to me, thanks. Reviewed-by: Filipe Manana <fdmanana@suse.com> > + > +echo -e "\nTesting invalid argument validation with options, should fail" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz:9' 2>&1 | _filter_scratch > +echo "***" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli:0' 2>&1 | _filter_scratch > +echo "***" > +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zst:3' 2>&1 | _filter_scratch > + > status=0 > exit > diff --git a/tests/btrfs/048.out b/tests/btrfs/048.out > index 16a785a642f7..016eba265b01 100644 > --- a/tests/btrfs/048.out > +++ b/tests/btrfs/048.out > @@ -92,3 +92,15 @@ Testing generation is unchanged after failed validation > generation 7 > ERROR: failed to set compression for SCRATCH_MNT: Invalid argument > generation 7 > + > +Testing argument validation with options > +*** > +*** > +*** > + > +Testing invalid argument validation with options, should fail > +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument > +*** > +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument > +*** > +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument > -- > 2.16.4 >
diff --git a/tests/btrfs/048 b/tests/btrfs/048 index 8bb10a904bc9..af2d4ff34414 100755 --- a/tests/btrfs/048 +++ b/tests/btrfs/048 @@ -226,5 +226,20 @@ $BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz' 2>&1 | _filter_scrat $BTRFS_UTIL_PROG filesystem sync $SCRATCH_MNT $BTRFS_UTIL_PROG inspect-internal dump-super $SCRATCH_DEV | grep '^generation' +echo -e "\nTesting argument validation with options" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lzo:9' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zlib:3' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zstd:0' 2>&1 | _filter_scratch +echo "***" + +echo -e "\nTesting invalid argument validation with options, should fail" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lz:9' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zli:0' 2>&1 | _filter_scratch +echo "***" +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zst:3' 2>&1 | _filter_scratch + status=0 exit diff --git a/tests/btrfs/048.out b/tests/btrfs/048.out index 16a785a642f7..016eba265b01 100644 --- a/tests/btrfs/048.out +++ b/tests/btrfs/048.out @@ -92,3 +92,15 @@ Testing generation is unchanged after failed validation generation 7 ERROR: failed to set compression for SCRATCH_MNT: Invalid argument generation 7 + +Testing argument validation with options +*** +*** +*** + +Testing invalid argument validation with options, should fail +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument +*** +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument +*** +ERROR: failed to set compression for SCRATCH_MNT: Invalid argument
The current btrfs/048 test-case did not check the behavior of properties with options like compression and with the compression level supplied. Add test cases for compression with compression level as well so we can be sure we don't regress there. Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> --- tests/btrfs/048 | 15 +++++++++++++++ tests/btrfs/048.out | 12 ++++++++++++ 2 files changed, 27 insertions(+)