aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Atkinson <[email protected]>2022-03-07 16:22:01 -0700
committerBrian Behlendorf <[email protected]>2022-03-08 09:20:33 -0800
commit08eb2309ce256d555a3a46d3887ca3d9bb9ead92 (patch)
tree8b5946cd6b2a81e01f6d5d1e327e13620161ccee
parent1b609d4b035930a044bf9133b4c9dcf172b3c101 (diff)
Cleaning up a couple of ZTS tests setup scripts
With the zfs_destroy ZTS test case the setup script needed to call default_setup_noexit so compression could be turned off. Also, added log_must to setting compression off in the reservation setup script for turning off compression. Reviewed-by: Brian Behlendorf <[email protected]> Reviewed-by: Rich Ercolani <[email protected]> Signed-off-by: Brian Atkinson <[email protected]> Closes #13173
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh5
-rwxr-xr-xtests/zfs-tests/tests/functional/reservation/setup.ksh2
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh
index 34c726362..f4288f715 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/setup.ksh
@@ -29,5 +29,6 @@
DISK=${DISKS%% *}
-default_setup $DISK
-zfs set compression=off $TESTPOOL/$TESTFS \ No newline at end of file
+default_setup_noexit $DISK
+log_must zfs set compression=off $TESTPOOL/$TESTFS
+log_pass
diff --git a/tests/zfs-tests/tests/functional/reservation/setup.ksh b/tests/zfs-tests/tests/functional/reservation/setup.ksh
index 6b5128c64..731aa6a30 100755
--- a/tests/zfs-tests/tests/functional/reservation/setup.ksh
+++ b/tests/zfs-tests/tests/functional/reservation/setup.ksh
@@ -32,5 +32,5 @@
. $STF_SUITE/include/libtest.shlib
default_setup_noexit ${DISKS%% *}
-zfs set compression=off $TESTPOOL
+log_must zfs set compression=off $TESTPOOL
log_pass