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 <behlendorf1@llnl.gov>
Reviewed-by: Rich Ercolani <rincebrain@gmail.com>
Signed-off-by: Brian Atkinson <batkinson@lanl.gov>
Closes #13173
This commit is contained in:
Brian Atkinson 2022-03-07 16:22:01 -07:00 committed by Brian Behlendorf
parent 1b609d4b03
commit 08eb2309ce
2 changed files with 4 additions and 3 deletions

View File

@ -29,5 +29,6 @@
DISK=${DISKS%% *}
default_setup $DISK
zfs set compression=off $TESTPOOL/$TESTFS
default_setup_noexit $DISK
log_must zfs set compression=off $TESTPOOL/$TESTFS
log_pass

View File

@ -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