Skip to content

Commit

Permalink
ZFS Tests: corrected arguments to include testpool
Browse files Browse the repository at this point in the history
Signed-off-by: QORTEC <lowell.bv@gmail.com>
  • Loading branch information
QORTEC committed Sep 28, 2023
1 parent f799988 commit e93a38c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
. $STF_SUITE/include/libtest.shlib
. $STF_SUITE/tests/functional/cli_root/zfs_mount/zfs_mount.kshlib

#
# DESCRIPTION:
# Verify that 'zfs mount -a filesystem' succeeds as root.
#
Expand All @@ -52,17 +53,19 @@ set -A ctr "" "$TESTCTR" "$TESTCTR/$TESTCTR1" "$TESTCTR1"
set -A vol "$TESTVOL" "$TESTVOL1"

# Test the mounted state of fs0
typeset fs0="${fs[0]}"
typeset fs0=${fs[0]}

# Ensure that fs1 remains unmounted
set -A fs1
typeset -i fs1_index=0
for element in "${fs[@]}"; do
for element in ${fs[@]}; do
if [[ "$element" != "$fs0" ]]; then
fs1[fs1_index++]="$element"
fi
done

fs0=$TESTPOOL/$fs0

function setup_all
{
typeset -i i=0
Expand Down Expand Up @@ -194,7 +197,7 @@ function verify_related


log_assert "Verify that 'zfs $mountall filesystem' succeeds as root, " \
"and all available ZFS filesystems are mounted."
"and all available related ZFS filesystems are mounted."

log_onexit cleanup_all

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,17 @@ set -A ctr "" "$TESTCTR" "$TESTCTR1" "$TESTCTR/$TESTCTR1"
set -A vol "$TESTVOL" "$TESTVOL1"

# Test the mounted state of fs0
typeset fs0="${fs[0]}"
typeset fs0=${fs[0]}

# Ensure that fs1 remains mounted
set -A fs1
typeset -i fs1_index=0
for element in "${fs[@]}"; do
for element in ${fs[@]}; do
if [[ "$element" != "$fs0" ]]; then
fs1[fs1_index++]="$element"
fi
done
fs0=$TESTPOOL/$fs0

function setup_all
{
Expand Down Expand Up @@ -183,7 +184,7 @@ function verify_related


log_assert "Verify that 'zfs $unmountall filesystem' succeeds as root, " \
"and all available ZFS filesystems are unmounted."
"and all available related ZFS filesystems are unmounted."

log_onexit cleanup_all

Expand Down

0 comments on commit e93a38c

Please sign in to comment.