diff options
author | Julian Andres Klode <jak@debian.org> | 2021-03-08 09:21:06 +0000 |
---|---|---|
committer | Julian Andres Klode <jak@debian.org> | 2021-03-08 09:21:06 +0000 |
commit | fbc06b381d14cfa9e2efb4b437b2ce1419e4f1a4 (patch) | |
tree | 24a6bc2a81d4b3d7ab716a1f5fd7acb619f0e528 /test/integration/test-method-rred | |
parent | 3a7aecd232dfdbcec5dbdc3af16e03479d47d917 (diff) | |
parent | 2a81f98b124d8fe551b160df55db1d3bf79a77c1 (diff) |
Merge branch 'fix/rredemptypatches' into 'master'
Deal with rred shortcomings around empty patch files
See merge request apt-team/apt!159
Diffstat (limited to 'test/integration/test-method-rred')
-rwxr-xr-x | test/integration/test-method-rred | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/integration/test-method-rred b/test/integration/test-method-rred index 645b0dfdd..5a42b8417 100755 --- a/test/integration/test-method-rred +++ b/test/integration/test-method-rred @@ -146,6 +146,7 @@ testrred 'Multi line change' 'more' '5,7c - even more good stuff - bonus good stuff $(tail -n 12 ./Packages)" +testrred 'Patch file' 'empty' '' "$(cat ./Packages)" failrred() { msgtest 'Failure caused by' "$1" @@ -161,7 +162,6 @@ failrred 'Bogus content' '<html> </html>' # not a problem per-se, but we want our parser to be really strict -failrred 'Empty patch file' '' failrred 'Empty line patch file' ' ' failrred 'Empty line before command' ' @@ -222,7 +222,8 @@ createpatch 'Remove more stuff and fix later' '23d, testsuccess apthelper cat-file --compress gzip Packages.ed-1 mv rootdir/tmp/testsuccess.output Packages.ed-1.gz testsuccess rm Packages.ed-1 -createpatch 'Remove (old) dog paragraph' '10,19d' > Packages.ed-2 +touch Packages.ed-2 # an empty patch +createpatch 'Remove (old) dog paragraph' '10,19d' > Packages.ed-3 mergepatches '11,19c Package: extra-kittens Version: unavailable |