From a5addbbb7d2f40a6403b7e78f241448783529d20 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BD=D0=B0=D0=B1?= Date: Tue, 15 Mar 2022 01:00:03 +0100 Subject: [PATCH] tests: rsend.kshlib: cmp_ds_prop: anonymise "inherited from" sourcces MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes rsend_012_pos: 00:04:59.68 SUCCESS: cmp_ds_prop testpool/testfs/vol testpool2/testfs/vol nosource 00:04:59.70 4c4 00:04:59.70 < acltype posix inherited from testpool 00:04:59.70 --- 00:04:59.70 > acltype posix inherited from testpool2 00:04:59.70 11,12c11,12 00:04:59.70 < devices off inherited from testpool 00:04:59.70 < exec on inherited from testpool 00:04:59.70 --- 00:04:59.70 > devices off inherited from testpool2 00:04:59.70 > exec on inherited from testpool2 00:04:59.70 17c17 00:04:59.70 < setuid off inherited from testpool 00:04:59.70 --- 00:04:59.70 > setuid off inherited from testpool2 00:04:59.70 ERROR: cmp_ds_prop testpool@final testpool2@final 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 fdda1f5e92..6f04a6b7bb 100644 --- a/tests/zfs-tests/tests/functional/rsend/rsend.kshlib +++ b/tests/zfs-tests/tests/functional/rsend/rsend.kshlib @@ -225,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/' -e 's/ inherited from [^/]*/ inherited from POOL/') \ + <(zfs get -Ho property,value$source $props $dtst2 | sed -e "s:$dtst2:PREFIX:g" -e 's/^origin [^@]*/origin POOL/' -e 's/ inherited from [^/]*/ inherited from POOL/') } #