From 1b61fa935ca0543ecb2beb8f2cb567bba28a426e Mon Sep 17 00:00:00 2001 From: Chunwei Chen Date: Sat, 21 Jan 2017 10:54:06 -0800 Subject: [PATCH] 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 Signed-off-by: Chunwei Chen Closes #5613 --- .../functional/cli_root/zfs_destroy/zfs_destroy_001_pos.ksh | 5 +++++ .../functional/cli_root/zpool_clear/zpool_clear_001_pos.ksh | 6 +----- .../cli_root/zpool_create/zpool_create_024_pos.ksh | 5 ----- .../tests/functional/delegate/zfs_allow_010_pos.ksh | 5 +++++ .../tests/functional/inheritance/inherit_001_pos.ksh | 5 ----- .../tests/functional/snapused/snapused_004_pos.ksh | 5 +++++ 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 e942eaebf4b8..e21a6aedbb97 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 '. 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 b88fbc8b70dc..b2a2ed5e4dc5 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 c38abf22b54d..1fa22d6ca426 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 16154dbed3ae..5ae2faf7058c 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 ae01a3bdf21d..0bbb77ce51be 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 2cc4cade042d..96af0d9b2600 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