Skip to content

Commit

Permalink
tests: rsend.kshlib: cmp_ds_prop: mask out differences in origin pool
Browse files Browse the repository at this point in the history
This fixes rsend_011_pos:
20:28:26.94 SUCCESS: cmp_ds_prop testpool/testfs/fs1/fs2 testpool2/testfs/fs1/fs2
20:28:26.96 2c2
20:28:26.96 < origin    testpool@psnap  -
20:28:26.96 ---
20:28:26.96 > origin    testpool2@psnap -
20:28:26.97 ERROR: cmp_ds_prop testpool/pclone testpool2/pclone exited 1

Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes openzfs#13250
Closes openzfs#13259
  • Loading branch information
nabijaczleweli authored and andrewc12 committed Sep 23, 2022
1 parent 9a51ddb commit 6c765e3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/zfs-tests/tests/functional/rsend/rsend.kshlib
Original file line number Diff line number Diff line change
Expand Up @@ -223,8 +223,8 @@ function cmp_ds_prop
fi

diff \
<(zfs get -Ho property,value,source $props $dtst1 | sed "s:$dtst1:PREFIX:g") \
<(zfs get -Ho property,value,source $props $dtst2 | sed "s:$dtst2:PREFIX:g")
<(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/')
}

#
Expand Down

0 comments on commit 6c765e3

Please sign in to comment.