tests: rsend.kshlib: cmp_ds_prop: allow skipping source

This fixes rsend_012_pos:
20:28:50.50 SUCCESS: eval zfs receive -d -F testpool2 < /mnt/testroot/backdir-rsend/pool-final-R
20:28:50.53 4,6c4,6
20:28:50.53 < acltype   off     local
20:28:50.53 < dnodesize 4k      local
20:28:50.53 < atime     off     local
20:28:50.53 ---
20:28:50.53 > acltype   off     received
20:28:50.53 > dnodesize 4k      received
20:28:50.53 > atime     off     received
20:28:50.53 8,13c8,13
20:28:50.53 < checksum  sha256  local
20:28:50.53 < compression       off     local
20:28:50.53 < copies    2       local
20:28:50.53 < devices   on      local
20:28:50.53 < exec      on      local
20:28:50.53 < quota     1G      local
20:28:50.53 ---
20:28:50.53 > checksum  sha256  received
20:28:50.53 > compression       off     received
20:28:50.53 > copies    2       received
20:28:50.53 > devices   on      received
20:28:50.53 > exec      on      received
20:28:50.53 > quota     1G      received
20:28:50.53 15c15
20:28:50.53 < recordsize        128K    local
20:28:50.53 ---
20:28:50.53 > recordsize        128K    received
20:28:50.53 17,18c17,18
20:28:50.53 < setuid    off     local
20:28:50.53 < snapdir   visible local
20:28:50.53 ---
20:28:50.53 > setuid    off     received
20:28:50.53 > snapdir   visible received
20:28:50.53 ERROR: cmp_ds_prop testpool testpool2 exited 1

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
Closes #13250
Closes #13259

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
index 1f6baf610db1bef98f2a7eb227e6e69af420d3e8..085b58954c42dc50b17c011e674b0d524d74e54d 100644 (file)
--- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
+++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib
@@ -212,6 +212,8 @@ function cmp_ds_prop
 {
        typeset dtst1=$1
        typeset dtst2=$2
+       typeset source=",source"
+       [ -n "$3" ] && source=
        typeset props="type,origin,volblocksize,acltype,dnodesize"
        props+=",atime,canmount,checksum,compression,copies,devices"
        props+=",exec,quota,readonly,recordsize,reservation,setuid"
@@ -223,8 +225,8 @@ function cmp_ds_prop
        fi
 
        diff \
-               <(zfs get -Ho property,value,source $props $dtst1 | sed -e "s:$dtst1:PREFIX:g" -e 's/^origin    [^@]*/origin    POOL/') \
-               <(zfs get -Ho property,value,source $props $dtst2 | sed -e "s:$dtst2:PREFIX:g" -e 's/^origin    [^@]*/origin    POOL/')
+               <(zfs get -Ho property,value$source $props $dtst1 | sed -e "s:$dtst1:PREFIX:g" -e 's/^origin    [^@]*/origin    POOL/') \
+               <(zfs get -Ho property,value$source $props $dtst2 | sed -e "s:$dtst2:PREFIX:g" -e 's/^origin    [^@]*/origin    POOL/')
 }
 
 #

diff --git a/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh b/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
index 6c75172be544b10f561d3b7188165c31e496b9a7..b92e5c460c205a68300c5fe817697887d478255d 100755 (executable)
--- a/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/rsend_012_pos.ksh
@@ -158,7 +158,7 @@ set -A pair         "$POOL"                 "$POOL2"                \
 
 typeset -i i=0
 while ((i < ${#pair[@]})); do
-       log_must cmp_ds_prop ${pair[$i]} ${pair[((i+1))]}
+       log_must cmp_ds_prop ${pair[$i]} ${pair[((i+1))]} nosource
        ((i += 2))
 done