X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/b0314abb0cbe5937d2d3cdcd6df9d322b69d03a0..146f7715a9f36d246b461255b3c683b479296915:/test/integration/test-authentication-basic diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic index 4b0ead54a..3a6897b59 100755 --- a/test/integration/test-authentication-basic +++ b/test/integration/test-authentication-basic @@ -18,13 +18,13 @@ testauthfailure() { testfailure apthelper download-file "${1}/bash" ./downloaded/bash # crappy test, but http and https output are wastely different… testsuccess grep 401 rootdir/tmp/testfailure.output - testsuccess test ! -s ./downloaded/bash + testfailure test -s ./downloaded/bash } testauthsuccess() { testsuccess apthelper download-file "${1}/bash" ./downloaded/bash testfileequal ./downloaded/bash "$(cat aptarchive/bash)" - testfilestats ./downloaded/bash '%U:%G:%a' '=' "${USER}:${USER}:644" + testfilestats ./downloaded/bash '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644" rm -f ./downloaded/bash # lets see if got/retains acceptable permissions @@ -32,13 +32,13 @@ testauthsuccess() { if [ "$(id -u)" = '0' ]; then testfilestats "$AUTHCONF" '%U:%G:%a' '=' "_apt:root:600" else - testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${USER}:${USER}:600" + testfilestats "$AUTHCONF" '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:600" fi fi rm -rf rootdir/var/lib/apt/lists testsuccess aptget update - testequal 'Reading package lists... + testsuccessequal 'Reading package lists... Building dependency tree... The following NEW packages will be installed: foo