diff options
Diffstat (limited to 'test/integration')
| -rwxr-xr-x | test/integration/test-method-rred | 3 | ||||
| -rwxr-xr-x | test/integration/test-pdiff-usage | 20 |
2 files changed, 18 insertions, 5 deletions
diff --git a/test/integration/test-method-rred b/test/integration/test-method-rred index 721aa5cdc..5a885e9d2 100755 --- a/test/integration/test-method-rred +++ b/test/integration/test-method-rred @@ -38,6 +38,8 @@ testrred() { cat Packages | runapt "${METHODSDIR}/rred" "$@" } testsuccessequal "$4" --nomsg rred -f Packages.ed + testsuccess runapt "${METHODSDIR}/rred" -t Packages Packages-patched Packages.ed + testfileequal Packages-patched "$4" } testrred 'Remove' 'first line' '1d' "$(tail -n +2 ./Packages)" @@ -152,6 +154,7 @@ failrred() { cat Packages | runapt "${METHODSDIR}/rred" "$@" } testfailure --nomsg rred -f Packages.ed + testfailure runapt "${METHODSDIR}/rred" -t Packages Packages-patched Packages.ed } failrred 'Bogus content' '<html> diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 4e2d1f182..dda9e3284 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -30,6 +30,10 @@ echo 'hacked' > aptarchive/hacked-i386 compressfile aptarchive/hacked-i386 wasmergeused() { + if echo "$*" | grep -q -- '-o test::cannot-use-pdiff=1'; then + find rootdir/var/lib/apt/lists/partial -name '*-patched*' -delete + fi + testsuccess apt update "$@" msgtest 'No intermediate patch files' 'still exist' @@ -292,8 +296,7 @@ SHA256-Download: $(sha256sum "${PATCHFILE}.gz" | cut -d' ' -f 1) $(stat -c%s "${PATCHFILE}.gz")000 $(basename "${PATCHFILE}.gz")" > "$PATCHINDEX" generatereleasefiles '+1hour' signreleasefiles - testsuccess apt update -o Debug::pkgAcquire::Diffs=1 "$@" - cp -f rootdir/tmp/testsuccess.output rootdir/tmp/aptupdate.output + wasmergeused "$@" -o test::cannot-use-pdiff=1 testsuccess grep 'bytes (Limit is' rootdir/tmp/aptupdate.output testnopackage oldstuff testsuccessequal "$(cat "${PKGFILE}-new") @@ -309,15 +312,22 @@ testcase() { testrun -o Acquire::PDiffs::Merge=0 -o APT::Get::List-Cleanup=0 "$@" testrun -o Acquire::PDiffs::Merge=1 -o APT::Get::List-Cleanup=0 "$@" } -partialleftovers() { touch "rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_Packages"; } +generatepartialleftovers() { + for f in "$@"; do + cat "${PKGFILE}" "${PKGFILE}" > "rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_${f}" + printf '\n\nInvalid\nStanza: yes\n\n' >> "rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_${f}" + done +} + +partialleftovers() { generatepartialleftovers 'Packages' 'Packages-patched'; } aptautotest_apt_update() { aptautotest_aptget_update "$@"; testsuccess test -e "rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_Packages"; } testcase -o Acquire::IndexTargets::deb::Packages::KeepCompressed=false -partialleftovers() { touch "rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_Packages.$LOWCOSTEXT"; } +partialleftovers() { generatepartialleftovers "Packages.${LOWCOSTEXT}" "Packages-patched.${LOWCOSTEXT}"; } aptautotest_apt_update() { aptautotest_aptget_update "$@"; testsuccess test -e "rootdir/var/lib/apt/lists/localhost:${APTHTTPPORT}_Packages.$LOWCOSTEXT"; } testcase -o Acquire::IndexTargets::deb::Packages::KeepCompressed=true -partialleftovers() { touch "rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_redirectme_Packages.$LOWCOSTEXT"; } +partialleftovers() { generatepartialleftovers "redirectme_Packages.${LOWCOSTEXT}" "redirectme_Packages-patched.${LOWCOSTEXT}"; } webserverconfig 'aptwebserver::redirect::replace::/redirectme/' "http://0.0.0.0:${APTHTTPPORT}/" rewritesourceslist "http://localhost:${APTHTTPPORT}/redirectme" aptautotest_apt_update() { |