correct cross & disappear progress detection

[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 7a3e5f1569d5bd91cd1cc24f9d297061fe618394..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
 
 #!/bin/sh
 set -e
 

-TESTDIR=$(readlink -f $(dirname $0))
-. $TESTDIR/framework
+TESTDIR="$(readlink -f "$(dirname "$0")")"
+. "$TESTDIR/framework"

 
 setupenvironment
 configarchitecture 'i386'
 
 setupenvironment
 configarchitecture 'i386'


@@ -22,7 +22,7 @@ testsuccessequal "good-pkg:
   Candidate: 1.0
   Version table:
      1.0 500
   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
 
 # now exchange to the Packages file, note that this could be
 # done via MITM too


@@ -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
 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:
 
 # 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
   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