Browse Source

fix http-pipeline-messup testcase

The test generates failures if the created deb files have the same size,
so we try a little harder to avoid having the same size for them.

Git-Dch: Ignore
tags/debian/1.1.exp4
David Kalnischkies 7 years ago
parent
commit
f9a3c4bde8
1 changed files with 12 additions and 8 deletions
  1. +12
    -8
      test/integration/test-http-pipeline-messup

+ 12
- 8
test/integration/test-http-pipeline-messup View File

@@ -7,10 +7,11 @@ TESTDIR=$(readlink -f $(dirname $0))
setupenvironment
configarchitecture "i386"

buildsimplenativepackage 'pkga' 'all' '1.0' 'stable'
buildsimplenativepackage 'pkgb' 'all' '1.0' 'stable'
buildsimplenativepackage 'pkgc' 'all' '1.0' 'stable'
buildsimplenativepackage 'pkgd' 'all' '1.0' 'stable'
# try a little harder to create a size mismatch
buildsimplenativepackage 'pkga' 'all' '1.0' 'stable' "Depends: foo" '' '' '' '' 'none'
buildsimplenativepackage 'pkgb' 'all' '1.0' 'stable' "Depends: foo" '' '' '' '' 'none'
buildsimplenativepackage 'pkgc' 'all' '1.0' 'stable' "Depends: f$(for i in $(seq 0 1000); do printf 'o'; done)" '' '' '' '' 'none'
buildsimplenativepackage 'pkgd' 'all' '1.0' 'stable' "Depends: f$(for i in $(seq 0 1000); do printf 'o'; done)" '' '' '' '' 'none'

setupaptarchive --no-update

@@ -21,17 +22,20 @@ changetowebserver \
-o 'aptwebserver::overwrite::.*pkgb.*::filename=/pool/pkgc_1.0_all.deb' \
-o 'aptwebserver::overwrite::.*pkgd.*::filename=/pool/pkga_1.0_all.deb'

testsuccess aptget update -o Debug::Acquire::http=1 -o Debug::pkgAcquire::Worker=1
echo 'Debug::Acquire::http "true";
Debug::pkgAcquire::Worker "true";' > rootdir/etc/apt/apt.conf.d/99debug

testsuccess aptget update

# messup is bigger than pipeline: checks if fixup isn't trying to hard
testfailure aptget download pkga pkgb pkgc pkgd "$@" -o Acquire::http::Pipeline-Depth=2
testfailure aptget download pkga pkgb pkgc pkgd -o Acquire::http::Pipeline-Depth=2
testfailure test -f pkga_1.0_all.deb

# ensure that pipeling is enabled for rest of this test
echo 'Acquire::http::Pipeline-Depth 10;' > rootdir/etc/apt/apt.conf.d/99enable-pipeline

# the output is a bit strange: it looks like it has downloaded pkga 4 times
testsuccess aptget download pkga pkgb pkgc pkgd -o Debug::Acquire::http=1 -o Debug::pkgAcquire::Worker=1
testsuccess aptget download pkga pkgb pkgc pkgd
for pkg in 'pkga' 'pkgb' 'pkgc' 'pkgd'; do
testsuccess test -f ${pkg}_1.0_all.deb
testsuccess cmp incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb
@@ -40,4 +44,4 @@ done

# while hashes will pass (as none are available), sizes will not match, so failure
# checks that no hashes means that pipeline depth is ignored as we can't fixup
testfailure aptget download pkga pkgb pkgc pkgd "$@" --allow-unauthenticated -o Acquire::ForceHash=ROT26
testfailure aptget download pkga pkgb pkgc pkgd --allow-unauthenticated -o Acquire::ForceHash=ROT26

Loading…
Cancel
Save