diff options
| author | Brian Behlendorf <[email protected]> | 2019-12-19 15:32:56 -0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-19 15:32:56 -0800 |
| commit | 5e8ac0559046e8432bc7ae3232e4d4d746b09a4d (patch) | |
| tree | 429fb261c6030dc14490ceaf9023cb4453de5ade /tests/zfs-tests | |
| parent | 523fc80069477e7ae493834f93ea3d37ce747cc8 (diff) | |
ZTS: Various test case fixes
* devices_001_pos and devices_002_neg - Failing after FreeBSD ZTS
merged due to missing 'function' keyword for create_dev_file_linux.
* pool_state - Occasionally fails due to an insufficient delay
before checking 'zpool status'. Increasing the delay from 1 to 3
seconds resolved the issue in local testing.
* procfs_list_basic - Fails when run in-tree because the logged
command is actually 'lt-zfs'. Updated the regex accordingly.
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Tony Hutter <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Kjeld Schouten <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #9748
Diffstat (limited to 'tests/zfs-tests')
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/zfs-tests/tests/functional/devices/devices_common.kshlib b/tests/zfs-tests/tests/functional/devices/devices_common.kshlib index 2148bae0a..2fa1dcff8 100644 --- a/tests/zfs-tests/tests/functional/devices/devices_common.kshlib +++ b/tests/zfs-tests/tests/functional/devices/devices_common.kshlib @@ -202,7 +202,7 @@ function create_dev_file_illumos return 0 } -create_dev_file_linux +function create_dev_file_linux { typeset filetype=$1 typeset filename=$2 diff --git a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh index a3afe0c42..6543f87c4 100755 --- a/tests/zfs-tests/tests/functional/procfs/pool_state.ksh +++ b/tests/zfs-tests/tests/functional/procfs/pool_state.ksh @@ -137,7 +137,7 @@ remove_disk $SDISK # background since the command will hang when the pool gets suspended. The # command will resume and exit after we restore the missing disk later on. zpool scrub $TESTPOOL2 & -sleep 1 # Give the scrub some time to run before we check if it fails +sleep 3 # Give the scrub some time to run before we check if it fails log_must check_all $TESTPOOL2 "SUSPENDED" diff --git a/tests/zfs-tests/tests/functional/procfs/procfs_list_basic.ksh b/tests/zfs-tests/tests/functional/procfs/procfs_list_basic.ksh index c9eff3649..88911aac6 100755 --- a/tests/zfs-tests/tests/functional/procfs/procfs_list_basic.ksh +++ b/tests/zfs-tests/tests/functional/procfs/procfs_list_basic.ksh @@ -48,7 +48,7 @@ function cleanup function count_snap_cmds { typeset expected_count=$1 - count=$(grep "command: zfs snapshot $FS@testsnapshot" | wc -l) + count=$(grep -E "command: (lt-)?zfs snapshot $FS@testsnapshot" | wc -l) log_must eval "[[ $count -eq $expected_count ]]" } |