Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

ZTS: /dev/null: accept no substitutes 

Instead of writing to "devnull" and rming it later, just
> /dev/null to not have to cleanup later.

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Paul Dagnelie <pcd@delphix.com>
Co-authored-by: Rich Ercolani <rincebrain@gmail.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13133
This commit is contained in:
Rich Ercolani 2021-12-16 23:19:22 -05:00 committed by Brian Behlendorf
parent dd899641ee
commit 7eb179be18
15 changed files with 34 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh
View File

@ -58,13 +58,13 @@ log_must zfs set "org.openzfs:snapprop=val" "$SENDFS@s1"
# 2. Verify command line options interact with '-b' correctly # 2. Verify command line options interact with '-b' correctly
typeset opts=("" "p" "Rp" "cew" "nv" "D" "DLPRcenpvw") typeset opts=("" "p" "Rp" "cew" "nv" "D" "DLPRcenpvw")
for opt in ${opts[@]}; do for opt in ${opts[@]}; do
log_must eval "zfs send -b$opt $SENDFS@s1 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -b$opt $SENDFS@s1 > /dev/null"
log_must eval "zfs send -b$opt -i $SENDFS@s1 $SENDFS@s2 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -b$opt -i $SENDFS@s1 $SENDFS@s2 > /dev/null"
log_must eval "zfs send -b$opt -I $SENDFS@s1 $SENDFS@s2 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -b$opt -I $SENDFS@s1 $SENDFS@s2 > /dev/null"
done done
for opt in ${opts[@]}; do for opt in ${opts[@]}; do
log_mustnot eval "zfs send -b$opt $SENDFS >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -b$opt $SENDFS > /dev/null"
log_mustnot eval "zfs send -b$opt $SENDFS#bm >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -b$opt $SENDFS#bm > /dev/null"
done done
# Do 3..6 in a loop to verify various combination of "zfs send" options # Do 3..6 in a loop to verify various combination of "zfs send" options

2
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_003_pos.ksh
View File

@ -61,7 +61,7 @@ log_must zfs snapshot $snap2
typeset -i i=0 typeset -i i=0
while (( i < ${#args[*]} )); do while (( i < ${#args[*]} )); do
log_must eval "zfs send -i ${args[i]} >$TEST_BASE_DIR/devnull" log_must eval "zfs send -i ${args[i]} > /dev/null"
(( i += 1 )) (( i += 1 ))
done done

2
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
View File

@ -95,7 +95,7 @@ log_must zfs snapshot $snap3
typeset -i i=0 typeset -i i=0
while (( i < ${#badargs[*]} )) while (( i < ${#badargs[*]} ))
do do
log_mustnot eval "zfs send ${badargs[i]} >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send ${badargs[i]} > /dev/null"
(( i = i + 1 )) (( i = i + 1 ))
done done

2
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_005_pos.ksh
View File

@ -61,6 +61,6 @@ log_must zfs snapshot -r $TESTPOOL@snap
log_must zpool export $TESTPOOL log_must zpool export $TESTPOOL
log_must zpool import -o readonly=on $TESTPOOL log_must zpool import -o readonly=on $TESTPOOL
log_must eval "zfs send -R $TESTPOOL@snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send -R $TESTPOOL@snap > /dev/null"
log_pass "'zfs send -R' can send from read-only pools" log_pass "'zfs send -R' can send from read-only pools"

10
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted.ksh
View File

@ -62,15 +62,15 @@ log_must eval "echo $passphrase1 | zfs create -o encryption=on" \
log_must zfs snapshot -r $snap log_must zfs snapshot -r $snap
log_must eval "zfs send $snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send $snap > /dev/null"
log_mustnot eval "zfs send -p $snap >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -p $snap > /dev/null"
log_mustnot eval "zfs send -R $snap >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -R $snap > /dev/null"
log_must zfs unmount $TESTPOOL/$TESTFS1 log_must zfs unmount $TESTPOOL/$TESTFS1
log_must zfs unload-key $TESTPOOL/$TESTFS1 log_must zfs unload-key $TESTPOOL/$TESTFS1
log_mustnot eval "zfs send $snap >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send $snap > /dev/null"
log_must eval "zfs send $TESTPOOL/$TESTFS1/child@snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send $TESTPOOL/$TESTFS1/child@snap > /dev/null"
log_pass "ZFS performs unencrypted sends of encrypted datasets, unless the" \ log_pass "ZFS performs unencrypted sends of encrypted datasets, unless the" \
"'-p' or '-R' options are specified" "'-p' or '-R' options are specified"

2
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_encrypted_unloaded.ksh
View File

@ -53,7 +53,7 @@ log_must eval "echo $passphrase | zfs create -o encryption=on" \
log_must zfs snapshot $snap log_must zfs snapshot $snap
log_must zfs unmount $TESTPOOL/$TESTFS1 log_must zfs unmount $TESTPOOL/$TESTFS1
log_must zfs unload-key $TESTPOOL/$TESTFS1 log_must zfs unload-key $TESTPOOL/$TESTFS1
log_mustnot eval "zfs send $snap >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send $snap > /dev/null"
log_pass "ZFS does not perform unencrypted sends from encrypted datasets" \ log_pass "ZFS does not perform unencrypted sends from encrypted datasets" \
"with unloaded keys." "with unloaded keys."

14
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_raw.ksh
View File

@ -57,21 +57,21 @@ log_must eval "echo $passphrase | zfs create -o encryption=on" \
log_must zfs snapshot $snap log_must zfs snapshot $snap
log_must zfs snapshot $snap1 log_must zfs snapshot $snap1
log_must eval "zfs send -w $snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send -w $snap > /dev/null"
log_must eval "zfs send -w $snap1 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -w $snap1 > /dev/null"
log_note "Verify ZFS can perform raw sends with properties" log_note "Verify ZFS can perform raw sends with properties"
log_must eval "zfs send -wp $snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send -wp $snap > /dev/null"
log_must eval "zfs send -wp $snap1 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -wp $snap1 > /dev/null"
log_note "Verify ZFS can perform raw replication sends" log_note "Verify ZFS can perform raw replication sends"
log_must eval "zfs send -wR $snap >$TEST_BASE_DIR/devnull" log_must eval "zfs send -wR $snap > /dev/null"
log_must eval "zfs send -wR $snap1 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -wR $snap1 > /dev/null"
log_note "Verify ZFS can perform a raw send of an encrypted datasets with" \ log_note "Verify ZFS can perform a raw send of an encrypted datasets with" \
"its key unloaded" "its key unloaded"
log_must zfs unmount $TESTPOOL/$TESTFS1 log_must zfs unmount $TESTPOOL/$TESTFS1
log_must zfs unload-key $TESTPOOL/$TESTFS1 log_must zfs unload-key $TESTPOOL/$TESTFS1
log_must eval "zfs send -w $snap1 >$TEST_BASE_DIR/devnull" log_must eval "zfs send -w $snap1 > /dev/null"
log_pass "ZFS performs raw sends of datasets" log_pass "ZFS performs raw sends of datasets"

5
tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh
View File

@ -49,7 +49,6 @@ function cleanup
datasetexists $PARENT && destroy_dataset $PARENT -rf datasetexists $PARENT && destroy_dataset $PARENT -rf
[[ -e $WARNF ]] && log_must rm -f $WARNF [[ -e $WARNF ]] && log_must rm -f $WARNF
rm -f $TEST_BASE_DIR/devnull
} }
log_assert "Verify 'zfs send -Rs' works as expected." log_assert "Verify 'zfs send -Rs' works as expected."
@ -66,12 +65,12 @@ log_note "Verify 'zfs send -R' fails to generate replication stream"\
log_must zfs create $PARENT log_must zfs create $PARENT
log_must zfs create $CHILD log_must zfs create $CHILD
log_must zfs snapshot $SNAP log_must zfs snapshot $SNAP
log_mustnot eval "zfs send -R $SNAP >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -R $SNAP > /dev/null"
log_note "Verify 'zfs send -Rs' warns about missing snapshots, "\ log_note "Verify 'zfs send -Rs' warns about missing snapshots, "\
"but still succeeds" "but still succeeds"
log_must eval "zfs send -Rs $SNAP 2> $WARNF >$TEST_BASE_DIR/devnull" log_must eval "zfs send -Rs $SNAP 2> $WARNF > /dev/null"
log_must eval "[[ -s $WARNF ]]" log_must eval "[[ -s $WARNF ]]"
log_pass "Verify 'zfs send -Rs' works as expected." log_pass "Verify 'zfs send -Rs' works as expected."

2
tests/zfs-tests/tests/functional/deadman/deadman_ratelimit.ksh
View File

@ -64,7 +64,7 @@ log_must file_write -b 1048576 -c 8 -o create -d 0 -f $mntpnt/file
log_must zpool export $TESTPOOL log_must zpool export $TESTPOOL
log_must zpool import $TESTPOOL log_must zpool import $TESTPOOL
log_must zinject -d $DISK1 -D 5:1 $TESTPOOL log_must zinject -d $DISK1 -D 5:1 $TESTPOOL
log_must dd if=$mntpnt/file of=$TEST_BASE_DIR/devnull oflag=sync log_must dd if=$mntpnt/file of=/dev/null oflag=sync
events=$(zpool events $TESTPOOL | grep -c ereport.fs.zfs.deadman) events=$(zpool events $TESTPOOL | grep -c ereport.fs.zfs.deadman)
log_note "events=$events" log_note "events=$events"

8
tests/zfs-tests/tests/functional/redacted_send/redacted_negative.ksh
View File

@ -45,11 +45,11 @@ log_must zfs snapshot $clone2@snap
# Incompatible flags # Incompatible flags
log_must zfs redact $sendfs@snap2 book $clone1@snap log_must zfs redact $sendfs@snap2 book $clone1@snap
log_mustnot eval "zfs send -R --redact book $sendfs@snap2 >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -R --redact book $sendfs@snap2 > /dev/null"
typeset arg typeset arg
for arg in "$sendfs" "$clone1#book"; do for arg in "$sendfs" "$clone1#book"; do
log_mustnot eval "zfs send --redact book $arg >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send --redact book $arg > /dev/null"
done done
# Bad redaction list arguments # Bad redaction list arguments
@ -58,7 +58,7 @@ log_mustnot zfs redact $sendfs@snap1 book
log_mustnot zfs redact $sendfs#book1 book4 $clone1 log_mustnot zfs redact $sendfs#book1 book4 $clone1
log_mustnot zfs redact $sendfs@snap1 book snap2 snap3 log_mustnot zfs redact $sendfs@snap1 book snap2 snap3
log_mustnot zfs redact $sendfs@snap1 book @snap2 @snap3 log_mustnot zfs redact $sendfs@snap1 book @snap2 @snap3
log_mustnot eval "zfs send --redact $sendfs#book $sendfs@snap >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send --redact $sendfs#book $sendfs@snap > /dev/null"
# Redaction snapshots not a descendant of tosnap # Redaction snapshots not a descendant of tosnap
log_mustnot zfs redact $sendfs@snap2 book $sendfs@snap2 log_mustnot zfs redact $sendfs@snap2 book $sendfs@snap2
@ -66,7 +66,7 @@ log_must zfs redact $sendfs@snap2 book2 $clone1@snap $clone2@snap
log_must eval "zfs send --redact book2 $sendfs@snap2 >$stream" log_must eval "zfs send --redact book2 $sendfs@snap2 >$stream"
log_must zfs redact $sendfs@snap2 book3 $clone1@snap $clone2@snap log_must zfs redact $sendfs@snap2 book3 $clone1@snap $clone2@snap
log_must eval "zfs send -i $sendfs@snap1 --redact book3 $sendfs@snap2 \ log_must eval "zfs send -i $sendfs@snap1 --redact book3 $sendfs@snap2 \
>$TEST_BASE_DIR/devnull" > /dev/null"
log_mustnot zfs redact $sendfs@snap3 $sendfs@snap3 $clone1@snap log_mustnot zfs redact $sendfs@snap3 $sendfs@snap3 $clone1@snap
# Full redacted sends of redacted datasets are not allowed. # Full redacted sends of redacted datasets are not allowed.

2
tests/zfs-tests/tests/functional/redacted_send/redacted_resume.ksh
View File

@ -81,7 +81,7 @@ log_must eval "zfs send --redact book1 $sendfs@snap >$stream"
dd if=$stream bs=64k count=1 | log_mustnot zfs receive -s $recvfs dd if=$stream bs=64k count=1 | log_mustnot zfs receive -s $recvfs
[[ "-" = $(get_prop receive_resume_token $recvfs) ]] && \ [[ "-" = $(get_prop receive_resume_token $recvfs) ]] && \
log_fail "Receive token not found." log_fail "Receive token not found."
log_mustnot eval "zfs send --saved --redact book1 $recvfs >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send --saved --redact book1 $recvfs > /dev/null"
log_must zfs recv -A $recvfs log_must zfs recv -A $recvfs
log_must datasetnonexists $recvfs log_must datasetnonexists $recvfs

2
tests/zfs-tests/tests/functional/removal/removal_with_send.ksh
View File

@ -28,7 +28,7 @@ function callback
{ {
create_snapshot $TESTPOOL/$TESTFS $TESTSNAP create_snapshot $TESTPOOL/$TESTFS $TESTSNAP
log_must ksh -c \ log_must ksh -c \
"zfs send $TESTPOOL/$TESTFS@$TESTSNAP >$TEST_BASE_DIR/devnull" "zfs send $TESTPOOL/$TESTFS@$TESTSNAP > /dev/null"
return 0 return 0
} }

11
tests/zfs-tests/tests/functional/rsend/rsend_016_neg.ksh
View File

@ -30,16 +30,9 @@
verify_runnable "both" verify_runnable "both"
function cleanup log_mustnot eval "zfs send -i \#bla $POOl/$FS@final > /dev/null"
{
rm -f $TEST_BASE_DIR/devnull
}
log_onexit cleanup
log_mustnot eval "zfs send -i \#bla $POOl/$FS@final > $TEST_BASE_DIR/devnull"
log_must eval "zfs send -R -i snapA $POOL/vol@snapA 2>&1 " \ log_must eval "zfs send -R -i snapA $POOL/vol@snapA 2>&1 " \
"> $TEST_BASE_DIR/devnull | grep -q WARNING" "> /dev/null | grep -q WARNING"
log_pass "Ensure that error conditions cause appropriate failures." log_pass "Ensure that error conditions cause appropriate failures."

2
tests/zfs-tests/tests/functional/rsend/send_invalid.ksh
View File

@ -44,7 +44,7 @@ log_must zfs snap $testfs@snap0
log_must zfs snap $testfs@snap1 log_must zfs snap $testfs@snap1
# Test bad send with the CLI # Test bad send with the CLI
log_mustnot eval "zfs send -i $testfs@snap1 $testfs@snap0 >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send -i $testfs@snap1 $testfs@snap0 > /dev/null"
# Test bad send with libzfs/libzfs_core # Test bad send with libzfs/libzfs_core
log_must badsend $testfs@snap0 $testfs@snap1 log_must badsend $testfs@snap0 $testfs@snap1

2
tests/zfs-tests/tests/functional/rsend/send_partial_dataset.ksh
View File

@ -103,7 +103,7 @@ set -A badargs \
while (( i < ${#badargs[*]} )) while (( i < ${#badargs[*]} ))
do do
log_mustnot eval "zfs send --saved ${badargs[i]} >$TEST_BASE_DIR/devnull" log_mustnot eval "zfs send --saved ${badargs[i]} > /dev/null"
(( i = i + 1 )) (( i = i + 1 ))
done done