Disable 'zfs remap' command

[mirror_zfs.git] / tests / zfs-tests / tests / functional / removal / removal_remap_deadlists.ksh

diff --git a/tests/zfs-tests/tests/functional/removal/removal_remap_deadlists.ksh b/tests/zfs-tests/tests/functional/removal/removal_remap_deadlists.ksh
index 5b5be66b3343fec798b5eeb1ffcce57fae07a129..a2f6580b4f14b3d4d707fad42baf0a59c3565a1d 100755 (executable)
--- a/tests/zfs-tests/tests/functional/removal/removal_remap_deadlists.ksh
+++ b/tests/zfs-tests/tests/functional/removal/removal_remap_deadlists.ksh
@@ -15,12 +15,15 @@
 #
 
 #
-# Copyright (c) 2015, 2016 by Delphix. All rights reserved.
+# Copyright (c) 2015, 2017 by Delphix. All rights reserved.
 #
 
 . $STF_SUITE/include/libtest.shlib
 . $STF_SUITE/tests/functional/removal/removal.kshlib
 
+# N.B. The 'zfs remap' command has been disabled and may be removed.
+export ZFS_REMAP_ENABLED=YES
+
 default_setup_noexit "$DISKS"
 log_onexit default_cleanup_noexit
 
@@ -34,11 +37,10 @@ log_must zfs snapshot $TESTPOOL/$TESTFS@snap-pre2
 log_must dd if=/dev/zero of=$TESTDIR/file bs=1024k count=100 \
     conv=notrunc seek=200
 
-log_must zpool remove $TESTPOOL $REMOVEDISK
 if is_linux; then
-       log_must wait_for_removal $TESTPOOL
+       log_must attempt_during_removal $TESTPOOL $REMOVEDISK zdb -cd $TESTPOOL
 else
-       log_must wait_for_removal $TESTPOOL zdb -cd $TESTPOOL
+       log_must attempt_during_removal $TESTPOOL $REMOVEDISK
 fi
 log_mustnot vdevs_in_pool $TESTPOOL $REMOVEDISK
 log_must zdb -cd $TESTPOOL