diff options
| author | Martin Matuska <mm@FreeBSD.org> | 2022-03-08 17:52:10 +0000 |
|---|---|---|
| committer | Martin Matuska <mm@FreeBSD.org> | 2022-03-08 17:53:02 +0000 |
| commit | c03c5b1c80914ec656fbee84539355d1fad68bf9 (patch) | |
| tree | 804d8ffb7943c01f04a7dfa4e98965881bcbfc3c /sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh | |
| parent | 5678114cd8b310bd6f0a5699f036fc5b18addd65 (diff) | |
| parent | a86e089415679cf1b98eb424a159bb36aa2c19e3 (diff) | |
| download | src-c03c5b1c80914ec656fbee84539355d1fad68bf9.tar.gz src-c03c5b1c80914ec656fbee84539355d1fad68bf9.zip | |
zfs: merge openzfs/zfs@a86e08941 (master) into main
Notable upstream pull request merges:
#9078: log xattr=sa create/remove/update to ZIL
#11919: Cross-platform xattr user namespace compatibility
#13014: Report dnodes with faulty bonuslen
#13016: FreeBSD: Fix zvol_cdev_open locking
#13019: spl: Don't check FreeBSD rwlocks for double initialization
#13027: Fix clearing set-uid and set-gid bits on a file when
replying a write
#13031: Add enumerated vdev names to 'zpool iostat -v' and
'zpool list -v'
#13074: Enable encrypted raw sending to pools with greater ashift
#13076: Receive checks should allow unencrypted child datasets
#13098: Avoid dirtying the final TXGs when exporting a pool
#13172: Fix ENOSPC when unlinking multiple files from full pool
Obtained from: OpenZFS
OpenZFS commit: a86e089415679cf1b98eb424a159bb36aa2c19e3
Diffstat (limited to 'sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh')
| -rwxr-xr-x | sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh index 2e12d2534412..17b191a36173 100755 --- a/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh +++ b/sys/contrib/openzfs/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_skip_missing.ksh @@ -49,7 +49,6 @@ function cleanup datasetexists $PARENT && destroy_dataset $PARENT -rf [[ -e $WARNF ]] && log_must rm -f $WARNF - rm -f $TEST_BASE_DIR/devnull } 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 $CHILD 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, "\ "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_pass "Verify 'zfs send -Rs' works as expected." |