DOSE-683 Checkpoint tests aren't fully adapted to work with object st…

…orage (openzfs#478)

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_after_rewind.ksh

@@ -44,7 +44,7 @@ log_must zpool checkpoint $TESTPOOL
 test_change_state_after_checkpoint
 
 log_must zpool export $TESTPOOL
-log_must zpool import --rewind-to-checkpoint $TESTPOOL
+log_must import_pool -e "--rewind-to-checkpoint" -p $TESTPOOL
 test_verify_pre_checkpoint_state
 
 log_must zpool checkpoint $TESTPOOL

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_discard.ksh

@@ -45,9 +45,9 @@ test_change_state_after_checkpoint
 log_must zpool checkpoint -d $TESTPOOL
 
 log_must zpool export $TESTPOOL
-log_mustnot zpool import --rewind-to-checkpoint $TESTPOOL
+log_mustnot import_pool -e "--rewind-to-checkpoint" -p $TESTPOOL
 
-log_must zpool import $TESTPOOL
+log_must import_pool -p $TESTPOOL
 test_verify_post_checkpoint_state
 
 log_pass "Discard checkpoint from pool."

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_invalid.ksh

@@ -73,8 +73,8 @@ done
 #
 log_mustnot zpool checkpoint -d $non_checkpointed
 log_must zpool export $non_checkpointed
-log_mustnot zpool import --rewind-to-checkpoint $non_checkpointed
-log_must zpool import $non_checkpointed
+log_mustnot import_pool -e "--rewind-to-checkpoint" -p $non_checkpointed
+log_must import_pool -p $non_checkpointed
 
 log_pass "Badly formed checkpoint related commands with " \
 	"invalid inputs fail as expected."

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_open.ksh

@@ -25,7 +25,7 @@
 #	1. Create pool
 #	2. Populate it
 #	3. Take checkpoint
-#	4. Modify data (include at least one destructive change) 
+#	4. Modify data (include at least one destructive change)
 #	5. Export and import pool
 #	6. Verify that the pool was opened with the most current
 #	   data and not the checkpointed state.
@@ -41,7 +41,7 @@ log_must zpool checkpoint $TESTPOOL
 test_change_state_after_checkpoint
 
 log_must zpool export $TESTPOOL
-log_must zpool import $TESTPOOL
+log_must import_pool -p $TESTPOOL
 
 test_verify_post_checkpoint_state
 

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_rewind.ksh

@@ -25,7 +25,7 @@
 #	1. Create pool
 #	2. Populate it
 #	3. Take checkpoint
-#	4. Modify data (include at least one destructive change) 
+#	4. Modify data (include at least one destructive change)
 #	5. Rewind to checkpoint
 #	6. Verify that the data before the checkpoint are present
 #	   and the data after the checkpoint is gone.
@@ -42,7 +42,7 @@ log_must zpool checkpoint $TESTPOOL
 test_change_state_after_checkpoint
 
 log_must zpool export $TESTPOOL
-log_must zpool import --rewind-to-checkpoint $TESTPOOL
+log_must import_pool -e "--rewind-to-checkpoint" -p $TESTPOOL
 
 test_verify_pre_checkpoint_state
 

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_ro_rewind.ksh

@@ -26,7 +26,7 @@
 #	1. Create pool
 #	2. Populate it
 #	3. Take checkpoint
-#	4. Modify data (include at least one destructive change) 
+#	4. Modify data (include at least one destructive change)
 #	5. Export and import the checkpointed state as readonly
 #	6. Verify that we can see the checkpointed state and not
 #	   the actual current state.
@@ -45,12 +45,12 @@ log_must zpool checkpoint $TESTPOOL
 test_change_state_after_checkpoint
 
 log_must zpool export $TESTPOOL
-log_must zpool import -o readonly=on --rewind-to-checkpoint $TESTPOOL
+log_must import_pool -e "-o readonly=on --rewind-to-checkpoint" -p $TESTPOOL
 
 test_verify_pre_checkpoint_state "ro-check"
 
 log_must zpool export $TESTPOOL
-log_must zpool import $TESTPOOL
+log_must import_pool -p $TESTPOOL
 
 test_verify_post_checkpoint_state
 

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_zdb.ksh

@@ -26,7 +26,7 @@
 #	1. Create pool
 #	2. Populate it
 #	3. Take checkpoint
-#	4. Modify data (include at least one destructive change) 
+#	4. Modify data (include at least one destructive change)
 #	5. Verify zdb finds checkpoint when run on current state
 #	6. Verify zdb finds old dataset when run on checkpointed
 #	   state
@@ -84,7 +84,7 @@ zdb -e $TESTPOOL | grep "Dataset $FS1" && \
 zdb -k -e $TESTPOOL | grep "Dataset $CHECKPOINTED_FS1" || \
 	log_fail "zdb could not find destroyed dataset in checkpoint"
 
-log_must zpool import $TESTPOOL
+log_must import_pool -p $TESTPOOL
 
 log_must zpool checkpoint -d $TESTPOOL
 

tests/zfs-tests/tests/functional/pool_checkpoint/checkpoint_zhack_feat.ksh

@@ -26,13 +26,13 @@
 #	1. Create pool
 #	2. Populate it
 #	3. Take checkpoint
-#	4. Modify data (include at least one destructive change) 
+#	4. Modify data (include at least one destructive change)
 #	5. Export pool
 #	6. Introduce a new feature in the pool which is unsupported
 #	   but readonly-compatible and increment its reference
 #	   number so it is marked active.
 #	7. Verify that the pool can't be opened writeable, but we
-#	   can rewind to the checkpoint (before the feature was 
+#	   can rewind to the checkpoint (before the feature was
 #	   introduced) if we want to.
 #
 
@@ -58,8 +58,8 @@ log_must zpool export $TESTPOOL
 log_must zhack feature enable -r $TESTPOOL 'com.company:future_feature'
 log_must zhack feature ref $TESTPOOL 'com.company:future_feature'
 
-log_mustnot zpool import $TESTPOOL
-log_must zpool import --rewind-to-checkpoint $TESTPOOL
+log_mustnot import_pool -p $TESTPOOL
+log_must import_pool -e "--rewind-to-checkpoint" -p $TESTPOOL
 
 test_verify_pre_checkpoint_state
 

tests/zfs-tests/tests/functional/pool_checkpoint/pool_checkpoint.kshlib

@@ -181,10 +181,10 @@ function cleanup_test_pool
 	# data from old pools.
 	#
 	if ! use_object_store; then
-        for disk in $DISKS; do
-            zpool labelclear -f $disk
-        done
-    fi
+		for disk in $DISKS; do
+			zpool labelclear -f $disk
+		done
+	fi
 }
 
 function cleanup_nested_pools