Merge branch 'debian/sid' into debian/experimental

[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 bd68fccf617e59af6b5e320f372291ef13e71e12..41b27f6917c78b797ee2d40576608852dcfc47f1 100755 (executable)
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -12,9 +12,9 @@ insertpackage 'stable' 'good-pkg' 'all' '1.0'
 setupaptarchive
 
 changetowebserver
 setupaptarchive
 
 changetowebserver

-ARCHIVE='http://localhost/'
+ARCHIVE='http://localhost:8080/'

 msgtest 'Initial apt-get update should work with' 'InRelease'
 msgtest 'Initial apt-get update should work with' 'InRelease'

-aptget update -qq && msgpass || msgfail
+testsuccess --nomsg aptget update

 
 # check that the setup is correct
 testequal "good-pkg:
 
 # check that the setup is correct
 testequal "good-pkg:


@@ -37,7 +37,7 @@ sed -i '/^-----BEGIN PGP SIGNATURE-----/,/^-----END PGP SIGNATURE-----/ s/^$/  /
 
 # we append the (evil unsigned) Release file to the (good signed) InRelease
 cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease
 
 # we append the (evil unsigned) Release file to the (good signed) InRelease
 cat aptarchive/dists/stable/Release >> aptarchive/dists/stable/InRelease

-
+touch -d '+1hour' aptarchive/dists/stable/InRelease

 
 # ensure the update fails
 # useful for debugging to add "-o Debug::pkgAcquire::auth=true"
 
 # ensure the update fails
 # useful for debugging to add "-o Debug::pkgAcquire::auth=true"