test exitcode as well as string equality

[apt.git] / test / integration / test-apt-key

diff --git a/test/integration/test-apt-key b/test/integration/test-apt-key
index b6b7b7909a8883a01b349cb533a7b648ccaa590c..989fe658c428ae963e1838aa2859660883a3a3f7 100755 (executable)
--- a/test/integration/test-apt-key
+++ b/test/integration/test-apt-key
@@ -17,7 +17,7 @@ testaptkeys() {
        if ! aptkey list | grep '^pub' > aptkey.list; then
                echo -n > aptkey.list
        fi
-       testequal "$1" cat ./aptkey.list
+       testfileequal './aptkey.list' "$1"
 }
 
 echo 'APT::Key::ArchiveKeyring "./keys/joesixpack.pub";
@@ -35,7 +35,7 @@ testrun() {
 
        testaptkeys 'pub   2048R/DBAC8DAE 2010-08-18'
 
-       testequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
+       testsuccessequal 'gpg: key DBAC8DAE: "Joe Sixpack (APT Testcases Dummy) <joe@example.org>" not changed
 gpg: Total number processed: 1
 gpg:              unchanged: 1' aptkey --fakeroot update