eipp: add Allow-Temporary-Remove-of-Essentials

[apt.git] / test / integration / test-acquire-same-file-multiple-times

diff --git a/test/integration/test-acquire-same-file-multiple-times b/test/integration/test-acquire-same-file-multiple-times
index 354c683f2395bcef1d82bee13c2faec470837b7e..a6825b2c2819d17b927bb63ecbe535fe0e50cde4 100755 (executable)
--- a/test/integration/test-acquire-same-file-multiple-times
+++ b/test/integration/test-acquire-same-file-multiple-times
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
+TESTDIR="$(readlink -f "$(dirname "$0")")"

 . "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64'
 . "$TESTDIR/framework"
 setupenvironment
 configarchitecture 'amd64'


@@ -58,11 +58,18 @@ testrun 'httpdown'
 
 httpredirectdown() {
        msgtest 'Redirect leads' 'first URI to the second URI'
 
 httpredirectdown() {
        msgtest 'Redirect leads' 'first URI to the second URI'

-       testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/foo2" "./downloaded/foo1" '' \
-               "http://localhost:${APTHTTPPORT}/foo" './downloaded/foo2' '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
-       cp rootdir/tmp/testsuccess.output download.log
-       testsuccess cmp "$TESTDIR/framework" ./downloaded/foo1
-       testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+       for i in 1 2 3 4 5 6 7 8 9 10; do
+               rm -f ./downloaded/foo1 ./downloaded/foo2
+               testsuccess --nomsg apthelper download-file "http://localhost:${APTHTTPPORT}/foo2" "./downloaded/foo1" '' \
+                       "http://localhost:${APTHTTPPORT}/foo" './downloaded/foo2' '' -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1
+               cp rootdir/tmp/testsuccess.output download.log
+               testsuccess cmp "$TESTDIR/framework" ./downloaded/foo1
+               testsuccess cmp ./downloaded/foo1 ./downloaded/foo2
+
+               if grep -q '103%20Redirect' ./download.log; then
+                       break
+               fi
+       done

        testequal '1' grep -c '200%20URI%20Start' ./download.log
        testequal '1' grep -c '103%20Redirect' ./download.log
        testequal '1' grep -c '201%20URI%20Done' ./download.log
        testequal '1' grep -c '200%20URI%20Start' ./download.log
        testequal '1' grep -c '103%20Redirect' ./download.log
        testequal '1' grep -c '201%20URI%20Done' ./download.log