avoid using global PendingError to avoid failing too often too soon

[apt.git] / test / integration / test-authentication-basic

diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic
index 21b0249703e89c4e405a70240e47d3f01d169f40..3a6897b5927b1e63b349176b265d2e19d4615c2f 100755 (executable)
--- a/test/integration/test-authentication-basic
+++ b/test/integration/test-authentication-basic
@@ -24,7 +24,7 @@ testauthfailure() {
 testauthsuccess() {
        testsuccess apthelper download-file "${1}/bash" ./downloaded/bash
        testfileequal ./downloaded/bash "$(cat aptarchive/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
        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
                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
                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
 Building dependency tree...
 The following NEW packages will be installed:
   foo