aboutsummaryrefslogtreecommitdiffstats
path: root/tests/runfiles
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2016-03-26 14:17:26 -0700
committerBrian Behlendorf <[email protected]>2016-03-30 09:30:34 -0700
commitc35b188246899714c156a52fdea179eab3717e92 (patch)
tree389d64ec0167aa2813668631f88ed5fae5969d5b /tests/runfiles
parent967798d04afc801e70bb12590e8325a32fb998dd (diff)
Fix zpool_scrub_* test cases
The zpool_scrub_002, zpool_scrub_003, zpool_scrub_004 test cases fail reliably when running against small pools or fast storage. This occurs because the scrub/resilver operation completes before subsequent commands can be run. A one second delay has been added to 10% of zio's in order to ensure the scrub/resilver operation will run for at least several seconds. Signed-off-by: Brian Behlendorf <[email protected]> Closes #4450
Diffstat (limited to 'tests/runfiles')
-rw-r--r--tests/runfiles/linux.run6
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index 013897189..9857dba1a 100644
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -327,11 +327,9 @@ tests = ['zpool_remove_001_neg', 'zpool_remove_002_pos']
[tests/functional/cli_root/zpool_replace]
tests = ['zpool_replace_001_neg']
-# DISABLED:
-# zpool_scrub_004_pos - needs investigation
-# zpool_scrub_005_pos - needs investigation
[tests/functional/cli_root/zpool_scrub]
-tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos']
+tests = ['zpool_scrub_001_neg', 'zpool_scrub_002_pos', 'zpool_scrub_003_pos',
+ 'zpool_scrub_004_pos', 'zpool_scrub_005_pos']
[tests/functional/cli_root/zpool_set]
tests = ['zpool_set_001_pos', 'zpool_set_002_neg', 'zpool_set_003_neg']