diff options
| author | Pavel Zakharov <[email protected]> | 2016-10-17 22:51:25 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2018-05-14 14:30:28 -0400 |
| commit | 189bd0b67085a6c26589201d256ff46a121f142f (patch) | |
| tree | 66c61aa299e0c94fd06380223eeaeaf94be9f0d4 /tests/zfs-tests | |
| parent | a11c7aaec9c10f22f3259545e2697005cfd19863 (diff) | |
OpenZFS 9190 - Fix cleanup routine in import_cachefile_device_replaced.ksh
Must clear slow-disk zinject injections in test cleanup routine.
Otherwise, when this test fails, it causes most subsequent tests
to fail.
Authored by: Pavel Zakharov <[email protected]>
Reviewed by: Dan Kimmel <[email protected]>
Reviewed by: John Kennedy <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: George Melikov <[email protected]>
Approved by: Robert Mustacchi <[email protected]>
Ported-by: Brian Behlendorf <[email protected]>
OpenZFS-issue: https://illumos.org/issues/9190
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/762c6b4
Closes #7530
Diffstat (limited to 'tests/zfs-tests')
| -rw-r--r-- | tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib index b785a2dbf..f53b88f79 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import.kshlib @@ -23,6 +23,9 @@ # function cleanup { + # clear any remaining zinjections + log_must zinject -c all > /dev/null + destroy_pool $TESTPOOL1 log_must rm -f $CPATH $CPATHBKP $CPATHBKP2 $MD5FILE $MD5FILE2 |