Fix test failures

Signed-off-by: Paul Dagnelie <[email protected]>

Author: Paul Dagnelie

tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add_001_pos.ksh

@@ -55,7 +55,7 @@ log_assert "'zpool add <pool> <vdev> ...' can add devices to the pool."
 
 log_onexit cleanup
 
-set -A keywords "" "mirror" "raidz" "raidz1" "anyraid" "anymirror1" "anymirror2" "anymirror3" "draid:1s" "draid1:1s" "spare"
+set -A keywords "" "mirror" "raidz" "raidz1" "anymirror" "anymirror1" "anymirror2" "anymirror3" "draid:1s" "draid1:1s" "spare"
 
 create_sparse_files "disk" 4 $MINVDEVSIZE2
 create_sparse_files "extradisk" 4 $MINVDEVSIZE2

tests/zfs-tests/tests/functional/fault/auto_spare_001_pos.ksh

@@ -57,7 +57,7 @@ zed_events_drain
 TESTFILE="/$TESTPOOL/$TESTFS/testfile"
 
 for type in "mirror" "raidz" "raidz2" "draid:1s" "anymirror1" "anymirror2" "anymirror3"; do
-        if [[ "$type" =~ "anyraid" ]]; then
+        if [[ "$type" =~ "anymirror" ]]; then
                 export VDEVSIZE=1073741824
                 export TESTFILE_SIZE=268435456
         else

tests/zfs-tests/tests/functional/trim/trim_config.ksh

@@ -91,7 +91,7 @@ for type in "" "mirror" "anymirror0" "anymirror1" "anymirror2" "anymirror3" "rai
 		VDEVS="$TRIM_VDEV1 $TRIM_VDEV2 $TRIM_VDEV3 $TRIM_VDEV4"
 	fi
 
-	if [[ "$type" =~ "anyraid" ]]; then
+	if [[ "$type" =~ "anymirror" ]]; then
 		# The AnyRAID VDEV takes some space for the mapping itself
 		VDEV_MAX_MB=$(( floor(3 * MINVDEVSIZE * 0.75 / 1024 / 1024) ))
 		VDEV_MIN_MB=$(( floor(3 * MINVDEVSIZE * 0.30 / 1024 / 1024) ))