diff options
| author | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:57:59 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@ubuntu.com> | 2014-11-06 08:57:59 +0100 |
| commit | f8fac12c5fa287476b781c96807baaa534ef8f76 (patch) | |
| tree | 222dd450a4bad958edc608ec575f27aed07ae68a /test/integration/test-apt-update-filesize-mismatch | |
| parent | 23e1a70b47329088a8f83bd94f5e774954c4c56a (diff) | |
| parent | 9397ea947c23c0957a683152360909810340abce (diff) | |
Merge remote-tracking branch 'mvo/feature/no-more-acquire-guessing' into debian/experimental
Diffstat (limited to 'test/integration/test-apt-update-filesize-mismatch')
| -rwxr-xr-x | test/integration/test-apt-update-filesize-mismatch | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/test/integration/test-apt-update-filesize-mismatch b/test/integration/test-apt-update-filesize-mismatch index b484c5161..f78b83b5f 100755 --- a/test/integration/test-apt-update-filesize-mismatch +++ b/test/integration/test-apt-update-filesize-mismatch @@ -38,16 +38,11 @@ for get in $(sed -n 's#^GET /\([^ ]\+\.gz\) HTTP.\+$#\1#p' aptarchive/webserver. done signreleasefiles - TEST='testfailure' - if expr match "$COMPRESSFILE" '^.*Translation-.*$' >/dev/null; then - TEST='testsuccess' - unset COMPRESSFILE - fi - $TEST aptget update -o Debug::pkgAcquire::Worker=1 - cp rootdir/tmp/${TEST}.output rootdir/tmp/update.output + testfailure aptget update -o Debug::pkgAcquire::Worker=1 + cp rootdir/tmp/testfailure.output rootdir/tmp/update.output testsuccess grep -E "$(basename -s '.gz' "$COMPRESSFILE").*Hash Sum mismatch" rootdir/tmp/update.output - $TEST aptcache show foo - $TEST aptget install foo -s + testfailure aptcache show foo + testfailure aptget install foo -s testfailure aptcache show bar testfailure aptget install bar -s |