diff options
| author | наб <[email protected]> | 2022-03-15 01:00:03 +0100 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2022-04-01 18:00:59 -0700 |
| commit | a5addbbb7d2f40a6403b7e78f241448783529d20 (patch) | |
| tree | 9085ef8a2c3a2677525f0b636b12afa98ff62ecd /tests | |
| parent | b2c5291b7e2b49e6b482c1be898e992bf0ccc37f (diff) | |
tests: rsend.kshlib: cmp_ds_prop: anonymise "inherited from" sourcces
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 <[email protected]>
Reviewed-by: John Kennedy <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Ahelenia Ziemiańska <[email protected]>
Closes #13250
Closes #13259
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/zfs-tests/tests/functional/rsend/rsend.kshlib | 4 |
1 files 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 fdda1f5e9..6f04a6b7b 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/') } # |