diff options
-rwxr-xr-x | tests/test-runner/bin/zts-report.py | 2 | ||||
-rwxr-xr-x | tests/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh | 25 |
2 files changed, 14 insertions, 13 deletions
diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index b6f855ef4..acb20048e 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -231,6 +231,7 @@ maybe = { ['FAIL', rewind_reason], 'cli_root/zpool_import/import_rewind_config_changed': ['FAIL', rewind_reason], + 'cli_root/zpool_import/import_cache_device_replaced': ['FAIL', '7765'], 'cli_root/zpool_import/zpool_import_missing_003_pos': ['SKIP', '6839'], 'cli_root/zpool_remove/setup': ['SKIP', disk_reason], 'cli_root/zpool_upgrade/zpool_upgrade_004_pos': ['FAIL', '6141'], @@ -250,6 +251,7 @@ maybe = { 'pyzfs/pyzfs_unittest': ['SKIP', python_deps_reason], 'no_space/enospc_002_pos': ['FAIL', enospc_reason], 'projectquota/setup': ['SKIP', exec_reason], + 'redundancy/redundancy_004_neg': ['FAIL', '7290'], 'reservation/reservation_008_pos': ['FAIL', '7741'], 'reservation/reservation_018_pos': ['FAIL', '5642'], 'rsend/rsend_019_pos': ['FAIL', '6086'], diff --git a/tests/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh b/tests/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh index 606a9575e..8f40436ff 100755 --- a/tests/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/replacement/replacement_001_pos.ksh @@ -39,7 +39,7 @@ # STRATEGY: # 1. Create multidisk pools (stripe/mirror/raidz) and # start some random I/O -# 2. Replace a disk in the pool with anbother disk. +# 2. Replace a disk in the pool with another disk. # 3. Verify the integrity of the file system and the resilvering. # @@ -50,7 +50,7 @@ function cleanup if [[ -n "$child_pids" ]]; then for wait_pid in $child_pids do - kill $wait_pid + kill $wait_pid done fi @@ -114,29 +114,28 @@ function replace_test done child_pids="" - log_must zpool export $TESTPOOL1 - log_must zpool import -d $TESTDIR $TESTPOOL1 - log_must zfs umount $TESTPOOL1/$TESTFS1 - log_must zdb -cdui $TESTPOOL1/$TESTFS1 - log_must zfs mount $TESTPOOL1/$TESTFS1 - + log_must zpool export $TESTPOOL1 + log_must zpool import -d $TESTDIR $TESTPOOL1 + log_must zfs umount $TESTPOOL1/$TESTFS1 + log_must zdb -cdui $TESTPOOL1/$TESTFS1 + log_must zfs mount $TESTPOOL1/$TESTFS1 } specials_list="" i=0 while [[ $i != 2 ]]; do - mkfile $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i - specials_list="$specials_list $TESTDIR/$TESTFILE1.$i" + log_must truncate -s $MINVDEVSIZE $TESTDIR/$TESTFILE1.$i + specials_list="$specials_list $TESTDIR/$TESTFILE1.$i" - ((i = i + 1)) + ((i = i + 1)) done # # Create a replacement disk special file. # -mkfile $MINVDEVSIZE $TESTDIR/$REPLACEFILE +log_must truncate -s $MINVDEVSIZE $TESTDIR/$REPLACEFILE -for type in "" "raidz" "raidz1" "mirror"; do +for type in "" "raidz" "mirror"; do for op in "" "-f"; do create_pool $TESTPOOL1 $type $specials_list log_must zfs create $TESTPOOL1/$TESTFS1 |