diff options
| author | Ryan Moeller <[email protected]> | 2020-03-17 12:55:18 -0400 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-03-17 09:55:18 -0700 |
| commit | 80d98a8f3addfbfa1feefef70774193ed18c1013 (patch) | |
| tree | 35982f389007fd8da38eab5b9be41d01ab7dbbd6 | |
| parent | e0d3284bc95d3d6b6660e8881454caf367ce460b (diff) | |
ZTS: Use default_cleanup_noexit where needed
And add log_pass appropriately.
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #10136
3 files changed, 7 insertions, 3 deletions
diff --git a/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh b/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh index c12d5973b..13775da91 100755 --- a/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/alloc_class/cleanup.ksh @@ -21,7 +21,7 @@ verify_runnable "global" -default_cleanup +default_cleanup_noexit disk_cleanup log_pass diff --git a/tests/zfs-tests/tests/functional/channel_program/synctask_core/cleanup.ksh b/tests/zfs-tests/tests/functional/channel_program/synctask_core/cleanup.ksh index 59f69ca8b..3ddcb4d27 100755 --- a/tests/zfs-tests/tests/functional/channel_program/synctask_core/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/channel_program/synctask_core/cleanup.ksh @@ -16,5 +16,7 @@ . $STF_SUITE/include/libtest.shlib -default_cleanup +default_cleanup_noexit destroy_pool testpool2 + +log_pass diff --git a/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh b/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh index e8bc8d514..aa032084c 100755 --- a/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/write_dirs/cleanup.ksh @@ -31,5 +31,7 @@ . $STF_SUITE/include/libtest.shlib -default_cleanup +default_cleanup_noexit rm -f $TEST_BASE_DIR/disk0 + +log_pass |