Skip to content

Commit

Permalink
ZTS: Various test case fixes
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
behlendorf authored Dec 19, 2019
1 parent 523fc80 commit 5e8ac05
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/procfs/pool_state.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]"
}

Expand Down

0 comments on commit 5e8ac05

Please sign in to comment.