* [PATCH fstests] btrfs: add validation of compression options to btrfs/048
@ 2019-06-06 10:07 Johannes Thumshirn
2019-06-06 11:16 ` Filipe Manana
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Thumshirn @ 2019-06-06 10:07 UTC (permalink / raw)
To: Eryu Guan; +Cc: Linux BTRFS Mailinglist, fstests, Johannes Thumshirn
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 "***"
+
+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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH fstests] btrfs: add validation of compression options to btrfs/048
2019-06-06 10:07 [PATCH fstests] btrfs: add validation of compression options to btrfs/048 Johannes Thumshirn
@ 2019-06-06 11:16 ` Filipe Manana
2019-06-06 11:39 ` [PATCH fstests v2] " Johannes Thumshirn
0 siblings, 1 reply; 5+ messages in thread
From: Filipe Manana @ 2019-06-06 11:16 UTC (permalink / raw)
To: Johannes Thumshirn; +Cc: Eryu Guan, Linux BTRFS Mailinglist, fstests
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
>
--
Filipe David Manana,
“Whether you think you can, or you think you can't — you're right.”
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH fstests v2] btrfs: add validation of compression options to btrfs/048
2019-06-06 11:16 ` Filipe Manana
@ 2019-06-06 11:39 ` Johannes Thumshirn
2019-06-06 15:32 ` Johannes Thumshirn
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Thumshirn @ 2019-06-06 11:39 UTC (permalink / raw)
To: Eryu Guan, Filipe Manana
Cc: Linux BTRFS Mailinglist, fstests, Johannes Thumshirn
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>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
---
Changes to v1:
- Removed output redirection and filtering for the cases we don't expect any
actual output (Filipe)
---
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..04df3ed98ff7 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'
+echo "***"
+$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zlib:3'
+echo "***"
+$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zstd:0'
+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
--
2.16.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH fstests v2] btrfs: add validation of compression options to btrfs/048
2019-06-06 11:39 ` [PATCH fstests v2] " Johannes Thumshirn
@ 2019-06-06 15:32 ` Johannes Thumshirn
2019-06-07 9:09 ` [PATCH fstests v3] " Johannes Thumshirn
0 siblings, 1 reply; 5+ messages in thread
From: Johannes Thumshirn @ 2019-06-06 15:32 UTC (permalink / raw)
To: Eryu Guan, Filipe Manana; +Cc: Linux BTRFS Mailinglist, fstests
On Thu, Jun 06, 2019 at 01:39:07PM +0200, Johannes Thumshirn wrote:
[...]
> +echo -e "\nTesting argument validation with options"
> +$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'lzo:9'
Please don't take this patch yet, setting lzo with a compression level should
fail but doesn't. I'll be addressing this soon (and update the test
accordingly)
Thanks,
Johannes
--
Johannes Thumshirn SUSE Labs Filesystems
jthumshirn@suse.de +49 911 74053 689
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: Felix Imendörffer, Mary Higgins, Sri Rasiah
HRB 21284 (AG Nürnberg)
Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH fstests v3] btrfs: add validation of compression options to btrfs/048
2019-06-06 15:32 ` Johannes Thumshirn
@ 2019-06-07 9:09 ` Johannes Thumshirn
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2019-06-07 9:09 UTC (permalink / raw)
To: Eryu Guan, Filipe Manana
Cc: Linux BTRFS Mailinglist, fstests, Johannes Thumshirn
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>
Reviewed-by: Filipe Manana <fdmanana@suse.com>
---
Changes to v2:
- Remove validation of lzo compression with option, lzo doesn't have
compression levels
Changes to v1:
- Removed output redirection and filtering for the cases we don't expect any
actual output (Filipe)
---
tests/btrfs/048 | 13 +++++++++++++
tests/btrfs/048.out | 11 +++++++++++
2 files changed, 24 insertions(+)
diff --git a/tests/btrfs/048 b/tests/btrfs/048
index 8bb10a904bc9..7294f231e4ed 100755
--- a/tests/btrfs/048
+++ b/tests/btrfs/048
@@ -226,5 +226,18 @@ $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 'zlib:3'
+echo "***"
+$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zstd:0'
+echo "***"
+
+echo -e "\nTesting invalid argument validation with options, should fail"
+$BTRFS_UTIL_PROG property set $SCRATCH_MNT compression 'zl: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..0923b00c01ed 100644
--- a/tests/btrfs/048.out
+++ b/tests/btrfs/048.out
@@ -92,3 +92,14 @@ 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
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-06-07 9:10 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-06 10:07 [PATCH fstests] btrfs: add validation of compression options to btrfs/048 Johannes Thumshirn
2019-06-06 11:16 ` Filipe Manana
2019-06-06 11:39 ` [PATCH fstests v2] " Johannes Thumshirn
2019-06-06 15:32 ` Johannes Thumshirn
2019-06-07 9:09 ` [PATCH fstests v3] " Johannes Thumshirn
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).