test exitcode as well as string equality

[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..4eb77b9a4fdc2dba99917b7fead5dbbdba1c196b 100755 (executable)
--- a/test/integration/test-bug-596498-trusted-unsigned-repo
+++ b/test/integration/test-bug-596498-trusted-unsigned-repo
@@ -18,16 +18,16 @@ aptgetupdate() {
 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 7)"
 DEBFILE='rootdir/etc/apt/sources.list.d/apt-test-unstable-deb.list'
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT

 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

 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 sed -i -e 's#deb#deb [trusted=no]#' $DEBFILE
 aptgetupdate 'testsuccess'
 
 Download complete and in download only mode" aptget install cool --assume-no -d --allow-unauthenticated
 
 sed -i -e 's#deb#deb [trusted=no]#' $DEBFILE
 aptgetupdate 'testsuccess'
 

-testequal "$PKGTEXT
+testfailureequal "$PKGTEXT

 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N
 WARNING: The following packages cannot be authenticated!
   cool
 Install these packages without verification? [y/N] N


@@ -37,13 +37,13 @@ find aptarchive/ \( -name 'Release.gpg' -o -name 'InRelease' \) -delete
 sed -i -e 's#deb \[trusted=no\]#deb#' $DEBFILE
 aptgetupdate
 
 sed -i -e 's#deb \[trusted=no\]#deb#' $DEBFILE
 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.


@@ -52,5 +52,5 @@ Download complete and in download only mode" aptget install cool --assume-no -d
 sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
 aptgetupdate
 
 sed -i -e 's#deb#deb [trusted=yes]#' $DEBFILE
 aptgetupdate
 

-testequal "$PKGTEXT
+testsuccessequal "$PKGTEXT

 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