import: require force when cachefile hostid doesn't match on-disk

[mirror_zfs.git] / tests / zfs-tests / tests / functional / cli_root / zpool_import / zpool_import_hostid_changed_cachefile_unclean_export.ksh

diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
index 8362d915f0cff9df94558def0800d4a18bf7efeb..dcb1ac1ab69f59638c3220bc8a64f7f5d118bdab 100755 (executable)
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_hostid_changed_cachefile_unclean_export.ksh
@@ -20,8 +20,8 @@
 
 #
 # DESCRIPTION:
-# A pool that wasn't cleanly exported should be importable from a cachefile
-# without force even if the local hostid doesn't match the on-disk hostid.
+# A pool that wasn't cleanly exported should not be importable from a cachefile
+# without force if the local hostid doesn't match the on-disk hostid.
 #
 # STRATEGY:
 #      1. Set a hostid.
@@ -32,8 +32,9 @@
 #      4.2. Export the pool.
 #      4.3. Restore the device state from the copy.
 #      5. Change the hostid.
-#      6. Verify that importing the pool from the cachefile succeeds
-#         without force.
+#      6. Verify that importing the pool from the cachefile fails.
+#      7. Verify that importing the pool from the cachefile with force
+#         succeeds.
 #
 
 verify_runnable "global"
@@ -64,8 +65,11 @@ log_must rm -f $VDEV0.bak
 # 5. Change the hostid.
 log_must zgenhostid -f $HOSTID2
 
-# 6. Verify that importing the pool from the cachefile succeeds without force.
-log_must zpool import -c $CPATHBKP $TESTPOOL1
+# 6. Verify that importing the pool from the cachefile fails.
+log_mustnot zpool import -c $CPATHBKP $TESTPOOL1
 
-log_pass "zpool import can import pool from cachefile if not cleanly " \
-    "exported when hostid changes."
+# 7. Verify that importing the pool from the cachefile with force succeeds.
+log_must zpool import -f -c $CPATHBKP $TESTPOOL1
+
+log_pass "zpool import from cachefile requires force if not cleanly " \
+    "exported and hostid changes."