New upstream version 0.7.3

[mirror_zfs-debian.git] / tests / zfs-tests / tests / functional / rsend / rsend.kshlib

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
index fde4123be872e60bde573f58942db36b2c4ce9c7..294d79807571c083db7897630dce9a3401574cdc 100644 (file)
--- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
+++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
@@ -513,11 +513,13 @@ function test_fs_setup
 {
        typeset sendfs=$1
        typeset recvfs=$2
+       typeset streamfs=$3
        typeset sendpool=${sendfs%%/*}
        typeset recvpool=${recvfs%%/*}
 
        datasetexists $sendfs && log_must zfs destroy -r $sendpool
        datasetexists $recvfs && log_must zfs destroy -r $recvpool
+       datasetexists $streamfs && log_must zfs destroy -r $streamfs
 
        if $(datasetexists $sendfs || zfs create -o compress=lz4 $sendfs); then
                mk_files 1000 256 0 $sendfs &
@@ -546,10 +548,7 @@ function test_fs_setup
                    ">/$sendpool/incremental.zsend"
        fi
 
-       if datasetexists $streamfs; then
-               log_must zfs destroy -r $streamfs
-       fi
-       log_must zfs create -o compress=lz4 $sendpool/stream
+       log_must zfs create -o compress=lz4 $streamfs
 }
 
 #
@@ -663,9 +662,10 @@ function resume_cleanup
 {
        typeset sendfs=$1
        typeset streamfs=$2
+       typeset sendpool=${sendfs%%/*}
 
        datasetexists $sendfs && log_must zfs destroy -r $sendfs
        datasetexists $streamfs && log_must zfs destroy -r $streamfs
        cleanup_pool $POOL2
-       rm -f /$POOL/initial.zsend /$POOL/incremental.zsend
+       rm -f /$sendpool/initial.zsend /$sendpool/incremental.zsend
 }