X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b53c9cea2902572822bbbece5bac236c1bbf846e..4b1fb7b1876bdb46cb7a0329158f12638baa2464:/test/integration/test-cve-2013-1051-InRelease-parsing?ds=inline diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing index a503ad0fe..3cc012e35 100755 --- 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 @@ -22,7 +22,7 @@ testsuccessequal "good-pkg: Candidate: 1.0 Version table: 1.0 500 - 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg + 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,7 +55,7 @@ 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: @@ -63,4 +63,4 @@ testsuccessequal "good-pkg: Candidate: 1.0 Version table: 1.0 500 - 500 ${ARCHIVE} stable/main i386 Packages" aptcache policy good-pkg + 500 ${ARCHIVE} stable/main all Packages" aptcache policy good-pkg