From f995e5ec43aa25c3e131e431606d141e121786f0 Mon Sep 17 00:00:00 2001 From: Giuseppe Di Natale Date: Tue, 18 Apr 2017 09:45:45 -0700 Subject: [PATCH] Clean up correctly in zpool_scrub_004_pos Ensure `zinject -c` all gets called whenever zpool_scrub_004_pos exits. Reviewed-by: George Melikov Reviewed-by: Brian Behlendorf Signed-off-by: Giuseppe Di Natale Issue #5444 Closes #6021 --- .../cli_root/zpool_scrub/zpool_scrub_004_pos.ksh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh index b2cb8893a074..fabe276266f8 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_scrub/zpool_scrub_004_pos.ksh @@ -46,6 +46,11 @@ # resilver does not complete before the scrub can be issued. This # can occur when testing with small pools or very fast hardware. +function cleanup +{ + log_must zinject -c all +} + verify_runnable "global" # See issue: https://github.com/zfsonlinux/zfs/issues/5444 @@ -53,6 +58,8 @@ if is_32bit; then log_unsupported "Test case fails on 32-bit systems" fi +log_onexit cleanup + log_assert "Resilver prevent scrub from starting until the resilver completes" log_must zpool detach $TESTPOOL $DISK2 @@ -66,5 +73,4 @@ while ! is_pool_resilvered $TESTPOOL; do sleep 1 done -log_must zinject -c all log_pass "Resilver prevent scrub from starting until the resilver completes"