diff options
author | Chunwei Chen <[email protected]> | 2017-01-21 10:54:06 -0800 |
---|---|---|
committer | Brian Behlendorf <[email protected]> | 2017-01-21 10:54:06 -0800 |
commit | 1b61fa935ca0543ecb2beb8f2cb567bba28a426e (patch) | |
tree | c7e403126b656b0cc2a7339bcc33e0d14bd2f9df /tests | |
parent | 10a3f8885904558c2a406151c4cf960371c34934 (diff) |
Partial revert "Disable slow tests for kmemleak"
Enable zpool_clear_001_pos, zpool_create_024_pos and inherit_001_pos. These
are no longer slow.
Also disable zfs_destroy_001_pos, zfs_allow_010_pos and snapused_004_pos,
as they fail very often.
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Chunwei Chen <[email protected]>
Closes #5613
Diffstat (limited to 'tests')
6 files changed, 16 insertions, 15 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh index e942eaebf..e21a6aedb 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh @@ -48,6 +48,11 @@ verify_runnable "both" +# See issue: https://github.com/zfsonlinux/zfs/issues/5479 +if is_kmemleak; then + log_unsupported "Test case often fail when kmemleak is enabled" +fi + # # According to parameters, 1st, create suitable testing environment. 2nd, # run 'zfs destroy $opt <dataset>'. 3rd, check the system status. diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh index b88fbc8b7..b2a2ed5e4 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh @@ -45,11 +45,6 @@ verify_runnable "global" -# See issue: https://github.com/zfsonlinux/zfs/issues/5479 -if is_kmemleak; then - log_unsupported "Test case runs slowly when kmemleak is enabled" -fi - function cleanup { poolexists $TESTPOOL1 && \ @@ -60,6 +55,7 @@ function cleanup done } + log_assert "Verify 'zpool clear' can clear errors of a storage pool." log_onexit cleanup diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh index c38abf22b..1fa22d6ca 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_024_pos.ksh @@ -39,11 +39,6 @@ verify_runnable "global" -# See issue: https://github.com/zfsonlinux/zfs/issues/5479 -if is_kmemleak; then - log_unsupported "Test case runs slowly when kmemleak is enabled" -fi - function cleanup { if [[ -n "$child_pids" ]]; then diff --git a/tests/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh b/tests/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh index 16154dbed..5ae2faf70 100755 --- a/tests/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh +++ b/tests/zfs-tests/tests/functional/delegate/zfs_allow_010_pos.ksh @@ -44,6 +44,11 @@ verify_runnable "both" +# See issue: https://github.com/zfsonlinux/zfs/issues/5479 +if is_kmemleak; then + log_unsupported "Test case often fail when kmemleak is enabled" +fi + log_assert "Verify privileged user has correct permissions once which was "\ "delegated to him in datasets" log_onexit restore_root_datasets diff --git a/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh b/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh index ae01a3bdf..0bbb77ce5 100755 --- a/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh +++ b/tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh @@ -45,11 +45,6 @@ verify_runnable "global" -# See issue: https://github.com/zfsonlinux/zfs/issues/5479 -if is_kmemleak; then - log_unsupported "Test case runs slowly when kmemleak is enabled" -fi - log_assert "Test properties are inherited correctly" # diff --git a/tests/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh b/tests/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh index 2cc4cade0..96af0d9b2 100755 --- a/tests/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/snapused/snapused_004_pos.ksh @@ -51,6 +51,11 @@ verify_runnable "both" +# See issue: https://github.com/zfsonlinux/zfs/issues/5479 +if is_kmemleak; then + log_unsupported "Test case often fail when kmemleak is enabled" +fi + function cleanup { log_must $ZFS destroy -rR $USEDTEST |