Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ZTS: Cleanup partition tables #9806

Merged
merged 1 commit into from
Jan 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions tests/zfs-tests/include/commands.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ export SYSTEM_FILES_LINUX='attr
blockdev
chattr
cksum
dmidecode
exportfs
fallocate
fdisk
Expand Down
7 changes: 4 additions & 3 deletions tests/zfs-tests/include/libtest.shlib
Original file line number Diff line number Diff line change
Expand Up @@ -2301,10 +2301,11 @@ function cleanup_devices #vdevs
{
typeset pool="foopool$$"

if poolexists $pool ; then
destroy_pool $pool
fi
for vdev in $@; do
zero_partitions $vdev
done

poolexists $pool && destroy_pool $pool
create_pool $pool $@
destroy_pool $pool

Expand Down
1 change: 0 additions & 1 deletion tests/zfs-tests/tests/functional/inuse/inuse_008_pos.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ while (( i < ${#vdevs[*]} )); do
create_pool $TESTPOOL1 ${vdevs[i]} $vslices spare $sslices
log_must zpool export $TESTPOOL1
verify_assertion "$rawtargets"
cleanup_devices $vslices $sslices

(( i = i + 1 ))
done
Expand Down