fix download-file using testcases to run as root

Git-Dch: Ignore

diff --git a/test/integration/test-apt-download-progress b/test/integration/test-apt-download-progress
index 65c438e8f994436703efd998ec5c36c5bbae794a..7caeca971f230fe7421d33c16e867dd52fdd8970 100755 (executable)
--- a/test/integration/test-apt-download-progress
+++ b/test/integration/test-apt-download-progress
@@ -24,18 +24,19 @@ assertprogress() {
 # actually report progress - but not too big to ensure its not delaying the
 # test too much
 TESTFILE=testfile.big
 # actually report progress - but not too big to ensure its not delaying the
 # test too much
 TESTFILE=testfile.big

-testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1 
+testsuccess dd if=/dev/zero of=./aptarchive/$TESTFILE bs=800k count=1

 
 OPT='-o APT::Status-Fd=3 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::Acquire::https=1'
 
 msgtest 'download progress works via' 'http'
 exec 3> apt-progress.log
 
 OPT='-o APT::Status-Fd=3 -o Debug::pkgAcquire::Worker=1 -o Debug::Acquire::http=1 -o Debug::Acquire::https=1'
 
 msgtest 'download progress works via' 'http'
 exec 3> apt-progress.log

-testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=800
+testsuccess --nomsg apthelper download-file "http://localhost:8080/$TESTFILE" ./downloaded/http-$TESTFILE $OPT -o Acquire::http::Dl-Limit=800

 assertprogress apt-progress.log
 
 msgtest 'download progress works via' 'https'
 exec 3> apt-progress.log
 assertprogress apt-progress.log
 
 msgtest 'download progress works via' 'https'
 exec 3> apt-progress.log

-testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800
+testsuccess --nomsg apthelper download-file "https://localhost:4433/$TESTFILE" ./downloaded/https-$TESTFILE $OPT -o Acquire::https::Dl-Limit=800
+assertprogress apt-progress.log

 
 # cleanup
 rm -f apt-progress*.log
 
 # cleanup
 rm -f apt-progress*.log

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index 431210797757de0281aea7b9e7cf36ddab34b7c6..00d859ad583a012491b43913c6bd348140f0dec2 100755 (executable)
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -14,32 +14,32 @@ test_apt_helper_download() {
     echo 'bar' > aptarchive/foo2
 
     msgtest 'apt-file download-file md5sum'
     echo 'bar' > aptarchive/foo2
 
     msgtest 'apt-file download-file md5sum'

-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
-    testfileequal foo2 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00
+    testfileequal ./downloaded/foo2 'foo'

 
     msgtest 'apt-file download-file sha1'
 
     msgtest 'apt-file download-file sha1'

-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
-    testfileequal foo1 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15
+    testfileequal ./downloaded/foo1 'foo'

 
     msgtest 'apt-file download-file sha256'
 
     msgtest 'apt-file download-file sha256'

-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
-    testfileequal foo3 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c
+    testfileequal ./downloaded/foo3 'foo'

 
     msgtest 'apt-file download-file no-hash'
 
     msgtest 'apt-file download-file no-hash'

-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo4
-    testfileequal foo4 'foo'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo4
+    testfileequal ./downloaded/foo4 'foo'

     
     msgtest 'apt-file download-file wrong hash'
     
     msgtest 'apt-file download-file wrong hash'

-    testfailure --nomsg apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc
+    testfailure --nomsg apthelper -qq download-file http://localhost:8080/foo ./downloaded/foo5 MD5Sum:aabbcc

     testfileequal rootdir/tmp/testfailure.output 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
 
 E: Download Failed'
     testfileequal rootdir/tmp/testfailure.output 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
 
 E: Download Failed'

-    testfileequal foo5.FAILED 'foo'
+    testfileequal ./downloaded/foo5.FAILED 'foo'

 
     msgtest 'apt-file download-file md5sum sha1'
 
     msgtest 'apt-file download-file md5sum sha1'

-    testsuccess --nomsg apthelper download-file http://localhost:8080/foo foo6 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 http://localhost:8080/foo2 foo7 SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f
-    testfileequal foo6 'foo'
-    testfileequal foo7 'bar'
+    testsuccess --nomsg apthelper download-file http://localhost:8080/foo ./downloaded/foo6 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 http://localhost:8080/foo2 ./downloaded/foo7 SHA1:e242ed3bffccdf271b7fbaf34ed72d089537b42f
+    testfileequal ./downloaded/foo6 'foo'
+    testfileequal ./downloaded/foo7 'bar'

 }
 
 test_apt_helper_detect_proxy() {
 }
 
 test_apt_helper_detect_proxy() {