test fixes

Signed-off-by: Paul Dagnelie <[email protected]>
openzfs · Jul 16, 2024 · 05ad004 · 05ad004
1 parent 91b5c82
commit 05ad004
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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