Merge pull request julian-klode/apt#3 from adrian17/master

[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 d9917455320fb159ff04edf8409b4764f5e7e2ad..3cc012e3507d31c1276b3f8af96094b3a430bc4a 100755 (executable)
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"
 
 setupenvironment
 configarchitecture 'i386'
@@ -12,7 +12,7 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
 setupaptarchive
 
 changetowebserver
-ARCHIVE='http://localhost:8080/'
+ARCHIVE="http://localhost:${APTHTTPPORT}"
 msgtest 'Initial apt-get update should work with' 'InRelease'
 testsuccess --nomsg aptget update
 
@@ -21,8 +21,8 @@ testsuccessequal "good-pkg:
   Installed: (none)
   Candidate: 1.0
   Version table:
-     1.0 0
-        500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
+     1.0 500
+        500 ${ARCHIVE} stable/main all Packages" aptcache policy good-pkg
 
 # now exchange to the Packages file, note that this could be
 # done via MITM too
@@ -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'
-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')"
 
@@ -55,12 +55,12 @@ Building dependency tree...
 E: Unable to locate package bad-mitm' aptget install bad-mitm -s
 
 # and verify that its not picked up
-testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
+testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm
 
 # and that the right one is used
 testsuccessequal "good-pkg:
   Installed: (none)
   Candidate: 1.0
   Version table:
-     1.0 0
-        500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg
+     1.0 500
+        500 ${ARCHIVE} stable/main all Packages" aptcache policy good-pkg