centralize unlink checks in acquire-item

[apt.git] / test / integration / test-cve-2013-1051-InRelease-parsing

diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index 933cbbd921b49760d3776d385fd9975e97bebd69..7a3e5f1569d5bd91cd1cc24f9d297061fe618394 100755 (executable)
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,7 +12,7 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
 setupaptarchive
 
 changetowebserver
 setupaptarchive
 
 changetowebserver

-ARCHIVE='http://localhost:8080'
+ARCHIVE="http://localhost:${APTHTTPPORT}"

 msgtest 'Initial apt-get update should work with' 'InRelease'
 testsuccess --nomsg aptget update
 
 msgtest 'Initial apt-get update should work with' 'InRelease'
 testsuccess --nomsg aptget update
 


@@ -21,7 +21,7 @@ testsuccessequal "good-pkg:
   Installed: (none)
   Candidate: 1.0
   Version table:
   Installed: (none)
   Candidate: 1.0
   Version table:

-     1.0 0
+     1.0 500

         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
 
 # now exchange to the Packages file, note that this could be
         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
 
 # now exchange to the Packages file, note that this could be


@@ -45,7 +45,7 @@ touch -d '+1hour' aptarchive/dists/stable/InRelease
 # part of the InRelease
 listcurrentlistsdirectory | sed '/_InRelease/ d' > listsdir.lst
 msgtest 'apt-get update should ignore unsigned data in the' 'InRelease'
 # part of the InRelease
 listcurrentlistsdirectory | sed '/_InRelease/ d' > listsdir.lst
 msgtest 'apt-get update should ignore unsigned data in the' 'InRelease'

-testsuccessequal "Get:1 http://localhost:8080 stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B]
+testsuccessequal "Get:1 http://localhost:${APTHTTPPORT} stable InRelease [$(stat -c%s aptarchive/dists/stable/InRelease) B]

 Reading package lists..." --nomsg aptget update
 testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')"
 
 Reading package lists..." --nomsg aptget update
 testfileequal './listsdir.lst' "$(listcurrentlistsdirectory | sed '/_InRelease/ d')"
 


@@ -62,5 +62,5 @@ testsuccessequal "good-pkg:
   Installed: (none)
   Candidate: 1.0
   Version table:
   Installed: (none)
   Candidate: 1.0
   Version table:

-     1.0 0
+     1.0 500

         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
         500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg