From ef3c549e00b2a0487ddee0aeb70e3a29f76c2fbb Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Fri, 8 Jan 2016 17:51:23 +0100 Subject: remove uncompressed leftover partial file before pdiff bootstrap The code already deals with compressed leftovers, but forgot the uncompressed files. The opertunity is picked to reorder this code and add debug messages about the actions taken as well as produce such a leftover file in the associated testcase. --- test/integration/test-pdiff-usage | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'test') diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index bf7779e40..253abb92c 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -60,6 +60,9 @@ testrun() { " aptcache show apt oldstuff configcompression '.' 'gz' + # see if the code deals properly with leftover partial files + touch rootdir/var/lib/apt/lists-bak/partial/localhost:${APTHTTPPORT}_Packages + msgmsg "Testcase: apply with one patch: $*" find aptarchive -name 'Packages*' -type f -delete cp "${PKGFILE}-new" aptarchive/Packages @@ -208,6 +211,9 @@ SHA256-Download: msgmsg "Testcase: pdiff patch bigger than index itself: $*" rm -rf rootdir/var/lib/apt/lists cp -a rootdir/var/lib/apt/lists-bak rootdir/var/lib/apt/lists + # the general testcode checks for leftovers in partial, but as this file + # is never touched in this test as it exits earlier its not a leftover… + rm -f rootdir/var/lib/apt/lists/partial/localhost:${APTHTTPPORT}_Packages cp "${PKGFILE}-new" aptarchive/Packages compressfile 'aptarchive/Packages' mkdir -p aptarchive/Packages.diff -- cgit v1.2.3