Skip to content

ZTS: fix zpool_export tests from always passing even if a failure occurs #18168

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.

Sign up for GitHub

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

Open
q5sys wants to merge 2 commits into
base: master
Choose a base branch
from
+24 −3
Open

ZTS: fix zpool_export tests from always passing even if a failure occurs #18168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0eb4a4
ZTS: Fix zpool_export.kshlib to prevent failing tests from passing
Nov 18, 2025
bc2a5a6
ZTS: Fix zpool_export_002_pos.ksh
Nov 18, 2025
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
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
function zpool_export_cleanup
{
[[ -d $TESTDIR0 ]] && log_must rm -rf $TESTDIR0
default_cleanup
default_cleanup_noexit
}
25 changes: 23 additions & 2 deletions tests/zfs-tests/tests/functional/cli_root/zpool_export/zpool_export_002_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
# busy i.e. mounted.
#
# STRATEGY:
# 1. Try and export the default pool when mounted and busy.
# 2. Verify an error is returned.
# 1. Create a pool and filesystem for testing.
# 2. Try and export the pool when mounted and busy.
# 3. Verify an error is returned.
#

verify_runnable "global"
Expand All @@ -56,6 +57,26 @@ log_onexit cleanup

log_assert "Verify a busy ZPOOL cannot be exported."

# Set up the pool and filesystem manually
DISK=${DISKS%% *}

# Clean up any existing pool
if poolexists $TESTPOOL ; then
destroy_pool $TESTPOOL
fi
[[ -d /$TESTPOOL ]] && rm -rf /$TESTPOOL

# Create the pool
log_must zpool create -f $TESTPOOL $DISK

# Create test directory
rm -rf $TESTDIR || log_unresolved "Could not remove $TESTDIR"
mkdir -p $TESTDIR || log_unresolved "Could not create $TESTDIR"

# Create filesystem with mountpoint
log_must zfs create $TESTPOOL/$TESTFS
log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS

log_must ismounted "$TESTPOOL/$TESTFS"
log_must cd $TESTDIR
log_mustnot zpool export $TESTPOOL
Expand Down
Loading