use pkgAcquire::GetLock instead of own code

[apt.git] / test / integration / test-apt-helper

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index 42c40bb9efc030ba375dfe64c1bcf43f34152f0c..06e497ff707fedebb21fbdd843218d4df6ea708c 100755 (executable)
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -13,23 +13,23 @@ test_apt_helper_download() {
     echo 'foo' > aptarchive/foo
 
     msgtest 'apt-file download-file' 'md5sum'
     echo 'foo' > aptarchive/foo
 
     msgtest 'apt-file download-file' 'md5sum'

-    apthelper -qq download-file http://localhost:8080/foo foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
-    testfileequal foo2 'foo'
+    apthelper -qq download-file http://localhost:8080/foo downloaded/foo2 MD5Sum:d3b07384d113edec49eaa6238ad5ff00 && msgpass || msgfail
+    testfileequal downloaded/foo2 'foo'

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

-    apthelper -qq download-file http://localhost:8080/foo foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
-    testfileequal foo1 'foo'
+    apthelper -qq download-file http://localhost:8080/foo downloaded/foo1 SHA1:f1d2d2f924e986ac86fdf7b36c94bcdf32beec15 && msgpass || msgfail
+    testfileequal downloaded/foo1 'foo'

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

-    apthelper -qq download-file http://localhost:8080/foo foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
-    testfileequal foo3 'foo'
+    apthelper -qq download-file http://localhost:8080/foo downloaded/foo3 SHA256:b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c && msgpass || msgfail
+    testfileequal downloaded/foo3 'foo'

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

-    apthelper -qq download-file http://localhost:8080/foo foo4 && msgpass || msgfail
-    testfileequal foo4 'foo'
+    apthelper -qq download-file http://localhost:8080/foo downloaded/foo4 && msgpass || msgfail
+    testfileequal downloaded/foo4 'foo'

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

-    if ! apthelper -qq download-file http://localhost:8080/foo foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then
+    if ! apthelper -qq download-file http://localhost:8080/foo downloaded/foo5 MD5Sum:aabbcc 2>&1 2> download.stderr; then

         msgpass
     else
         msgfail
         msgpass
     else
         msgfail


@@ -37,7 +37,8 @@ test_apt_helper_download() {
     testfileequal download.stderr 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
 
 E: Download Failed'
     testfileequal download.stderr 'E: Failed to fetch http://localhost:8080/foo  Hash Sum mismatch
 
 E: Download Failed'

-    testfileequal foo5.FAILED 'foo'
+    testfileequal downloaded/foo5.FAILED 'foo'
+    testfailure test -e downloaded/foo5

 }
 
 test_apt_helper_detect_proxy() {
 }
 
 test_apt_helper_detect_proxy() {