summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib b/tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib
index 679ff3049..6ffd85b5b 100644
--- a/tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib
+++ b/tests/zfs-tests/tests/functional/upgrade/upgrade_common.kshlib
@@ -34,8 +34,8 @@ export TMPDEV=$TEST_BASE_DIR/zpool_upgrade_test.dat
function cleanup_upgrade
{
- datasetexists $TESTPOOL/fs1 && log_must zfs destroy $TESTPOOL/fs1
- datasetexists $TESTPOOL/fs2 && log_must zfs destroy $TESTPOOL/fs2
- datasetexists $TESTPOOL/fs3 && log_must zfs destroy $TESTPOOL/fs3
- datasetexists $TESTPOOL && log_must zpool destroy $TESTPOOL
+ destroy_dataset "$TESTPOOL/fs1"
+ destroy_dataset "$TESTPOOL/fs2"
+ destroy_dataset "$TESTPOOL/fs3"
+ destroy_pool "$TESTPOOL"
}