Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / test / integration / test-ubuntu-bug-784473-InRelease-one-message-only

diff --git a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
index 782798e1be1f9fb97afffa6eb9395afb2ce8df18..fe42ba83de2c4789bc75e71e30c1cb0e3cfd553a 100755 (executable)
--- a/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
+++ b/test/integration/test-ubuntu-bug-784473-InRelease-one-message-only
@@ -8,11 +8,9 @@ configarchitecture 'i386'
 
 insertpackage 'unstable' 'apt' 'i386' '0.8.11'
 
 
 insertpackage 'unstable' 'apt' 'i386' '0.8.11'
 

-setupaptarchive
+export APT_DONT_SIGN='Release.gpg'
+setupaptarchive --no-update

 
 

-rm -rf rootdir/var/lib/apt/lists
-
-find aptarchive/ -name 'Release.gpg' -delete

 find aptarchive/ -name 'InRelease' -exec cp {} {}.old \;
 
 for RELEASE in $(find aptarchive/ -name 'InRelease'); do
 find aptarchive/ -name 'InRelease' -exec cp {} {}.old \;
 
 for RELEASE in $(find aptarchive/ -name 'InRelease'); do


@@ -28,7 +26,7 @@ MD5Sum:
 done
 
 testfailure aptget update
 done
 
 testfailure aptget update

-testsuccess grep '^W:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output
+testsuccess grep '^E:.*Clearsigned file .*NOSPLIT.*' rootdir/tmp/testfailure.output

 
 
 ROOTDIR="$(readlink -f .)"
 
 
 ROOTDIR="$(readlink -f .)"