projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
eipp: add Allow-Temporary-Remove-of-Essentials
[apt.git]
/
test
/
integration
/
test-http-pipeline-messup
diff --git
a/test/integration/test-http-pipeline-messup
b/test/integration/test-http-pipeline-messup
index dda8ef7eb1737e03b085ee71e7ed8c40d405395d..95e890baf49005a3df2211fd9d661208ea63463c 100755
(executable)
--- a/
test/integration/test-http-pipeline-messup
+++ b/
test/integration/test-http-pipeline-messup
@@
-1,13
+1,14
@@
#!/bin/sh
set -e
#!/bin/sh
set -e
-TESTDIR=
$(readlink -f $(dirname $0))
-.
$TESTDIR/framework
+TESTDIR=
"$(readlink -f "$(dirname "$0")")"
+.
"$TESTDIR/framework"
setupenvironment
configarchitecture "i386"
# try a little harder to create a size mismatch
setupenvironment
configarchitecture "i386"
# try a little harder to create a size mismatch
+buildsimplenativepackage 'pkg0' 'all' '1.0' 'stable' "Depends: foo" '' '' '' '' 'none'
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 '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'
@@
-27,18
+28,26
@@
Debug::pkgAcquire::Worker "true";' > rootdir/etc/apt/apt.conf.d/99debug
testsuccess aptget update
testsuccess aptget update
-# messup is bigger than pipeline: checks if fixup isn't trying to hard
+cd downloaded
+# messup is bigger than pipeline: checks if fixup isn't trying too 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
+for pkg in 'pkga' 'pkgd'; do
+ testfailure test -f ${pkg}_1.0_all.deb
+done
+for pkg in 'pkgb' 'pkgc'; do
+ testsuccess test -f ${pkg}_1.0_all.deb
+ testsuccess cmp ../incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb
+ rm -f ${pkg}_1.0_all.deb
+done
# ensure that pipeling is enabled for rest of this test
# ensure that pipeling is enabled for rest of this test
-echo 'Acquire::http::Pipeline-Depth 10;' > rootdir/etc/apt/apt.conf.d/99enable-pipeline
+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
# the output is a bit strange: it looks like it has downloaded pkga 4 times
-testwarning aptget download pkga pkgb pkgc pkgd
-for pkg in 'pkga' 'pkgb' 'pkgc' 'pkgd'; do
+testwarning aptget download pkg
0 pkg
a pkgb pkgc pkgd
+for pkg in 'pkg
0' 'pkg
a' 'pkgb' 'pkgc' 'pkgd'; do
testsuccess test -f ${pkg}_1.0_all.deb
testsuccess test -f ${pkg}_1.0_all.deb
- testsuccess cmp incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb
+ testsuccess cmp
../
incoming/${pkg}_1.0_all.deb ${pkg}_1.0_all.deb
rm -f ${pkg}_1.0_all.deb
done
rm -f ${pkg}_1.0_all.deb
done