From 91933eb9770066388047cb8f4b8a63ed6b1d2944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Mon, 14 Mar 2022 22:50:56 +0100 Subject: [PATCH] tests: rsend.kshlib: cmp_ds_prop: mask out differences in origin pool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: John Kennedy Reviewed-by: Ryan Moeller Signed-off-by: Ahelenia Ziemiańska Closes #13250 Closes #13259 --- tests/zfs-tests/tests/functional/rsend/rsend.kshlib | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib index 0098f64712..1f6baf610d 100644 --- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib +++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib @@ -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/') } #