Skip to content

Commit

Permalink
tests: rsend.kshlib: cmp_ds_prop: anonymise "inherited from" sourcces
Browse files Browse the repository at this point in the history
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 openzfs#13250
Closes openzfs#13259
  • Loading branch information
nabijaczleweli authored and andrewc12 committed Sep 23, 2022
1 parent 52438f4 commit 762bdf8
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 @@ -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/')
}

#
Expand Down

0 comments on commit 762bdf8

Please sign in to comment.