Merge branch 'debian/experimental' into feature/srv-records

[apt.git] / test / integration / test-apt-get-changelog

diff --git a/test/integration/test-apt-get-changelog b/test/integration/test-apt-get-changelog
index 648dccf40c5813ed1ab7d9b64f3f171f674d0095..7e81c71b68bf5eb4ef46fc2aa2ae8e38f57612dd 100755 (executable)
--- a/test/integration/test-apt-get-changelog
+++ b/test/integration/test-apt-get-changelog
@@ -21,9 +21,9 @@ chmod -R -w rootdir/var/cache/apt/archives
 
 echo 'Apt::Changelogs::Server "http://localhost:8080/";' > rootdir/etc/apt/apt.conf.d/changelog.conf
 
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
+testsuccessequal "'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt --print-uris
 
-testequal "'http://localhost:8080/pool/apt_1.0/changelog'
+testsuccessequal "'http://localhost:8080/pool/apt_1.0/changelog'
 'http://localhost:8080/pool/apt_1.0/changelog'" aptget changelog apt apt --print-uris
 
 cd downloaded
@@ -33,7 +33,7 @@ testfileequal '../rootdir/tmp/testsuccess.output' "$(cat ../aptarchive/pool/apt_
 
 testsuccess aptget changelog apt -d
 testfileequal 'apt.changelog' "$(cat  ../aptarchive/pool/apt_1.0/changelog)"
-testfilestats 'apt.changelog' '%U:%G:%a' '=' "${USER}:${USER}:644"
+testfilestats 'apt.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
 rm -f apt.changelog ../aptarchive/pool/apt_1.0/changelog
 
 testequal "$(cat ../aptarchive/pool/apt_1.0.changelog)" aptget changelog apt \
@@ -41,7 +41,7 @@ testequal "$(cat ../aptarchive/pool/apt_1.0.changelog)" aptget changelog apt \
 
 testsuccess aptget changelog apt -d
 testfileequal 'apt.changelog' "$(cat ../aptarchive/pool/apt_1.0.changelog)"
-testfilestats 'apt.changelog' '%U:%G:%a' '=' "${USER}:${USER}:644"
+testfilestats 'apt.changelog' '%U:%G:%a' '=' "${TEST_DEFAULT_USER}:${TEST_DEFAULT_GROUP}:644"
 rm -f apt.changelog ../aptarchive/pool/apt_1.0.changelog
 
 testequal 'E: changelog download failed' aptget changelog apt -qq -d -o APT::Changelogs::Server='http://not-on-the-main-server:8080/'