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.

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

Update rsend_014_pos and send-c_volume test cases #6088

Merged
merged 1 commit into from
May 4, 2017
Merged

Update rsend_014_pos and send-c_volume test cases #6088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions tests/zfs-tests/tests/functional/rsend/rsend_014_pos.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ verify_runnable "both"
log_assert "zfs send will work on filesystems and volumes in a read-only pool."
log_onexit cleanup_pool $POOL2

log_must eval "zpool export $POOL"
log_must eval "zpool import -o readonly=on $POOL"
log_must zpool export $POOL
log_must zpool import -o readonly=on $POOL
log_must eval "zfs send -R $POOL@final > $BACKDIR/pool-final-R"
log_must eval "zfs receive -d -F $POOL2 < $BACKDIR/pool-final-R"

Expand All @@ -46,9 +46,8 @@ log_must cleanup_pool $POOL2

log_must eval "zfs send -R $POOL/$FS@final > $BACKDIR/fs-final-R"
log_must eval "zfs receive -d $POOL2 < $BACKDIR/fs-final-R"
block_device_wait
log_must eval "zpool export $POOL"
log_must eval "zpool import $POOL"
log_must_busy zpool export $POOL
log_must zpool import $POOL

dstds=$(get_dst_ds $POOL/$FS $POOL2)
log_must cmp_ds_subs $POOL/$FS $dstds
Expand Down
5 changes: 5 additions & 0 deletions tests/zfs-tests/tests/functional/rsend/send-c_volume.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ function cleanup

verify_runnable "both"

# See issue: https://github.com/zfsonlinux/zfs/issues/6087
if is_32bit; then
log_unsupported "Test case occasionally fails on 32-bit systems"
fi

log_assert "Verify compressed send works with volumes"
log_onexit cleanup

Expand Down