enhance apt-key debugging options

[apt.git] / test / integration / test-bug-596498-trusted-unsigned-repo

diff --git a/test/integration/test-bug-596498-trusted-unsigned-repo b/test/integration/test-bug-596498-trusted-unsigned-repo
index 1e5e75b0e836291de2c1cb901fa708abcdd3a45e..c515837a354e69d26cef979f83c882e42284e92d 100755 (executable)
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -15,42 +15,48 @@ aptgetupdate() {
        ${1:-testwarning} aptget update --allow-insecure-repositories
 }
 
        ${1:-testwarning} aptget update --allow-insecure-repositories
 }
 

-PKGTEXT="$(aptget install cool --assume-no -d | head -n 7)"
-DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-deb.list'
+PKGTEXT="$(aptget install cool --assume-no -d | head -n 8)"
+DOWNLOG="$(echo "$PKGTEXT" | tail -n 1)"
+PKGTEXT="$(echo "$PKGTEXT" | head -n 7)"
+DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-*.list'

 
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG

 Download complete and in download only mode" aptget install cool --assume-no -d
 
 Download complete and in download only mode" aptget install cool --assume-no -d
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG

 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 

-sed -i -e 's#deb#deb [trusted=no]#' $DEBFILE
+sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=no] #' $DEBFILE

 aptgetupdate 'testsuccess'
 
 aptgetupdate 'testsuccess'
 

-testequal "$PKGTEXT
+testfailureequal "$PKGTEXT

 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N
 E: Some packages could not be authenticated" aptget install cool --assume-no -d
 
 find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N
 E: Some packages could not be authenticated" aptget install cool --assume-no -d
 
 find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete

-sed -i -e 's#deb \[trusted=no\]#deb#' $DEBFILE
+sed -i -e 's#\(deb\(-src\)\?\) \[trusted=no\] #\1 #' $DEBFILE

 aptgetupdate
 
 aptgetupdate
 

-testequal "$PKGTEXT
+testfailureequal "$PKGTEXT

 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N
 E: Some packages could not be authenticated" aptget install cool --assume-no -d
 
 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N
 E: Some packages could not be authenticated" aptget install cool --assume-no -d
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT

 WARNING: The following packages cannot be authenticated!
   cool
 Authentication warning overridden.
 WARNING: The following packages cannot be authenticated!
   cool
 Authentication warning overridden.

+$DOWNLOG

 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 

-sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
+sed -i -e 's#\(deb\(-src\)\?\) #\1 [trusted=yes] #' $DEBFILE

 aptgetupdate
 
 aptgetupdate
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT
+$DOWNLOG

 Download complete and in download only mode" aptget install cool --assume-no -d
 Download complete and in download only mode" aptget install cool --assume-no -d