From e5bb443cf58cec23503ad0deeeb06a080053da8a Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Sat, 7 Nov 2020 22:52:20 +0100 Subject: Support compressed output from rred similar to apt-helper cat-file --- test/integration/test-method-rred | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/integration/test-method-rred b/test/integration/test-method-rred index bef1a35e0..fcadac146 100755 --- a/test/integration/test-method-rred +++ b/test/integration/test-method-rred @@ -198,9 +198,13 @@ failrred 'End before start' '7,6d' # deal correctly with patch merging mergepatches() { - testsuccess runapt "${METHODSDIR}/rred" Packages.ed-* + local CONTENT="$1" + shift + testsuccess runapt "${METHODSDIR}/rred" Packages.ed-* "$@" cp -a rootdir/tmp/testsuccess.output patch.ed - testfileequal 'patch.ed' "$1" + if [ "$#" = '0' ]; then + testfileequal 'patch.ed' "$CONTENT" + fi } createpatch() { echo "$2" @@ -223,7 +227,14 @@ mergepatches '11,19c Package: extra-kittens Version: unavailable . +6d' -C 'gzip' +mv patch.ed patch.ed.gz +mergepatches '11,19c +Package: extra-kittens +Version: unavailable +. 6d' +testfileequal patch.ed "$(apt-helper cat-file patch.ed.gz)" testrred 'Apply' 'merged patch' "$(cat patch.ed)" 'Package: coolstuff Version: 0.8.15 Description: collection of stuff -- cgit v1.2.3-18-g5258