From 05ad004cc6581f89e4f9667ecdc7aeb0ae89a60b Mon Sep 17 00:00:00 2001 From: Paul Dagnelie Date: Tue, 16 Jul 2024 13:19:26 -0700 Subject: [PATCH] test fixes Signed-off-by: Paul Dagnelie --- tests/zfs-tests/tests/functional/shared_log/cleanup.ksh | 4 ++++ tests/zfs-tests/tests/functional/shared_log/shared_log.cfg | 7 ++----- .../tests/functional/shared_log/shared_log.kshlib | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/zfs-tests/tests/functional/shared_log/cleanup.ksh b/tests/zfs-tests/tests/functional/shared_log/cleanup.ksh index 5126ce2bc411..ea1df9f99dc7 100755 --- a/tests/zfs-tests/tests/functional/shared_log/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/shared_log/cleanup.ksh @@ -29,6 +29,10 @@ verify_runnable "global" +zpool import $LOGPOOL +zpool import ${LOGPOOL}2 +zpool import $TESTPOOL +zpool import $TESTPOOL2 if datasetexists $TESTPOOL ; then log_must zpool destroy -f $TESTPOOL fi diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log.cfg b/tests/zfs-tests/tests/functional/shared_log/shared_log.cfg index f4edc5ae8c1a..de65a15b8abc 100644 --- a/tests/zfs-tests/tests/functional/shared_log/shared_log.cfg +++ b/tests/zfs-tests/tests/functional/shared_log/shared_log.cfg @@ -24,8 +24,5 @@ # export LOGPOOL="${TESTPOOL}_log" -IFS=' ' read -r -a array <<< "$DISKS" - -export DISK0="${array[0]}" -export DISK1="${array[1]}" -export DISK2="${array[2]}" +read -r DISK1 DISK2 DISK3 _ <<<"$DISKS" +export DISK1 DISK2 DISK3 diff --git a/tests/zfs-tests/tests/functional/shared_log/shared_log.kshlib b/tests/zfs-tests/tests/functional/shared_log/shared_log.kshlib index db85c5b0f9e5..45973420b0f8 100644 --- a/tests/zfs-tests/tests/functional/shared_log/shared_log.kshlib +++ b/tests/zfs-tests/tests/functional/shared_log/shared_log.kshlib @@ -29,8 +29,8 @@ function cleanup { zpool import $LOGPOOL zpool import ${LOGPOOL}2 - zpool import $TESTPOOL - zpool import $TESTPOOL2 + zpool import -m $TESTPOOL + zpool import -m $TESTPOOL2 poolexists $TESTPOOL && destroy_pool $TESTPOOL poolexists $TESTPOOL2 && destroy_pool $TESTPOOL2 poolexists $LOGPOOL && destroy_pool $LOGPOOL