From 08eb2309ce256d555a3a46d3887ca3d9bb9ead92 Mon Sep 17 00:00:00 2001 From: Brian Atkinson Date: Mon, 7 Mar 2022 16:22:01 -0700 Subject: [PATCH] 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 Reviewed-by: Rich Ercolani Signed-off-by: Brian Atkinson Closes #13173 --- .../tests/functional/cli_root/zfs_destroy/setup.ksh | 5 +++-- tests/zfs-tests/tests/functional/reservation/setup.ksh | 2 +- 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 34c726362f..f4288f715b 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 6b5128c645..731aa6a306 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