diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-03-13 13:05:30 +0100 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-03-13 13:05:30 +0100 |
| commit | f345d0571d055c2cd5da3a9e423753f1ac21a9aa (patch) | |
| tree | 161c6fa25b6dbf594f69754b3241b6b04777dda1 /test/integration/test-pdiff-usage | |
| parent | 51c04562559d0924aa52cc8c9b69901bc8a5c945 (diff) | |
Test that SHA1-only .diff/Index files are not used
Ensure that .diff/Index files that only contain SHA1 values and no
SHA2 values are not used.
Diffstat (limited to 'test/integration/test-pdiff-usage')
| -rwxr-xr-x | test/integration/test-pdiff-usage | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage index 98d75d894..69c4ccee5 100755 --- a/test/integration/test-pdiff-usage +++ b/test/integration/test-pdiff-usage @@ -30,12 +30,12 @@ wasmergeused() { msgtest 'Check if the right pdiff merger was used' if grep -q '^pkgAcqIndexMergeDiffs::Done(): rred' rootdir/tmp/testsuccess.output; then - if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then + if echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1' && ! (echo "$*" | grep -q -- '-o test::cannot-use-pdiff=1'); then msgpass else msgfail "Merge shouldn't have been used, but was" fi - elif echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1'; then + elif echo "$*" | grep -q -- '-o Acquire::PDiffs::Merge=1' && !(echo "$*" | grep -q -- '-o test::cannot-use-pdiff=1'); then msgfail "Merge should have been used, but wasn't" else msgpass @@ -103,6 +103,36 @@ SHA256-Download: testsuccessequal "$(cat "${PKGFILE}-new") " aptcache show apt newstuff + msgmsg "Testcase: apply with one patch and SHA1 only: $*" + find aptarchive -name 'Packages*' -type f -delete + cp "${PKGFILE}-new" aptarchive/Packages + compressfile 'aptarchive/Packages' + mkdir -p aptarchive/Packages.diff + PATCHFILE="aptarchive/Packages.diff/$(date +%Y-%m-%d-%H%M.%S)" + diff -e "${PKGFILE}" "${PKGFILE}-new" > "${PATCHFILE}" || true + cat "$PATCHFILE" | gzip > "${PATCHFILE}.gz" + PATCHINDEX='aptarchive/Packages.diff/Index' + echo "SHA1-Current: $(sha1sum "${PKGFILE}-new" | cut -d' ' -f 1) $(stat -c%s "${PKGFILE}-new") +SHA1-History: + 9f4148e06d7faa37062994ff10d0c842d7017513 33053002 2010-08-18-2013.28 + $(sha1sum "$PKGFILE" | cut -d' ' -f 1) $(stat -c%s "$PKGFILE") $(basename "$PATCHFILE") +SHA1-Patches: + 7651fc0ac57cd83d41c63195a9342e2db5650257 19722 2010-08-18-2013.28 + $(sha1sum "$PATCHFILE" | cut -d' ' -f 1) $(stat -c%s "$PATCHFILE") $(basename "$PATCHFILE")" > "$PATCHINDEX" + if $DOWNLOADHASH; then + echo "SHA1-Download: + 2365ac0ac57cde3d43c63145e8251a3bd5410213 197 2010-08-18-2013.28.gz + $(sha1sum "${PATCHFILE}.gz" | cut -d' ' -f 1) $(stat -c%s "${PATCHFILE}.gz") $(basename "${PATCHFILE}.gz")" >> "$PATCHINDEX" + fi + + generatereleasefiles '+1hour' + signreleasefiles + find aptarchive -name 'Packages*' -type f -delete + wasmergeused "$@" -o test::cannot-use-pdiff=1 + testnopackage oldstuff + testsuccessequal "$(cat "${PKGFILE}-new") +" aptcache show apt newstuff + msgmsg "Testcase: apply with two patches: $*" cp "${PKGFILE}-new" aptarchive/Packages echo ' |