test exitcode as well as string equality

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

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index ff5d506b51ca04818f10c2420eac6597c23d4c4d..431210797757de0281aea7b9e7cf36ddab34b7c6 100755 (executable)
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -44,7 +44,7 @@ E: Download Failed'
 
 test_apt_helper_detect_proxy() {
     # no proxy
-    testequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
+    testsuccessequal "Using proxy '' for URL 'http://example.com/'" apthelper auto-detect-proxy http://example.com/
 
 
     # http auto detect proxy script
@@ -55,7 +55,7 @@ EOF
     chmod 755 apt-proxy-detect
     echo "Acquire::http::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
 
-    testequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
+    testsuccessequal "Using proxy 'http://some-proxy' for URL 'http://www.example.com/'" apthelper auto-detect-proxy http://www.example.com
 
 
     # https auto detect proxy script
@@ -66,14 +66,14 @@ EOF
     chmod 755 apt-proxy-detect
     echo "Acquire::https::Proxy-Auto-Detect \"$(pwd)/apt-proxy-detect\";" > rootdir/etc/apt/apt.conf.d/02proxy-detect
 
-    testequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
+    testsuccessequal "Using proxy 'https://https-proxy' for URL 'https://ssl.example.com/'" apthelper auto-detect-proxy https://ssl.example.com
 }
 
 test_apt_helper_download
 test_apt_helper_detect_proxy
 
 # test failure modes
-testequal 'E: Invalid operation download' apthelper download
-testequal 'E: Must specify at least one pair url/filename' apthelper download-file
-testequal 'E: Must specify at least one pair url/filename' apthelper download-file http://example.org/
-testequal 'E: Need one URL as argument' apthelper auto-detect-proxy
+testfailureequal 'E: Invalid operation download' apthelper download
+testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file
+testfailureequal 'E: Must specify at least one pair url/filename' apthelper download-file http://example.org/
+testfailureequal 'E: Need one URL as argument' apthelper auto-detect-proxy