Browse Source

tests: use quiet level 0 by default in tests

Git-Dch: Ignore
tags/debian/1.1_exp16
David Kalnischkies 5 years ago
parent
commit
87d6947d51
29 changed files with 117 additions and 107 deletions
  1. +4
    -2
      test/integration/framework
  2. +3
    -4
      test/integration/test-acquire-binary-all
  3. +5
    -5
      test/integration/test-apt-ftparchive-cachedb
  4. +5
    -5
      test/integration/test-apt-ftparchive-src-cachedb
  5. +1
    -1
      test/integration/test-apt-get-download
  6. +6
    -6
      test/integration/test-apt-get-install-deb
  7. +3
    -3
      test/integration/test-apt-get-install-virtual-pkgs
  8. +2
    -2
      test/integration/test-apt-get-update-unauth-warning
  9. +3
    -3
      test/integration/test-apt-helper
  10. +7
    -7
      test/integration/test-apt-mark
  11. +6
    -3
      test/integration/test-apt-update-failure-propagation
  12. +2
    -2
      test/integration/test-apt-update-file
  13. +1
    -1
      test/integration/test-apt-update-ims
  14. +1
    -1
      test/integration/test-apt-update-nofallback
  15. +1
    -0
      test/integration/test-authentication-basic
  16. +17
    -12
      test/integration/test-bug-612099-multiarch-conflicts
  17. +1
    -1
      test/integration/test-bug-683786-build-dep-on-virtual-packages
  18. +1
    -1
      test/integration/test-bug-738785-switch-protocol
  19. +2
    -1
      test/integration/test-bug-753297-upgradable
  20. +2
    -2
      test/integration/test-bug-758153-versioned-provides-support
  21. +3
    -3
      test/integration/test-conflicts-real-multiarch-same
  22. +1
    -1
      test/integration/test-cve-2013-1051-InRelease-parsing
  23. +1
    -1
      test/integration/test-disappearing-packages
  24. +2
    -2
      test/integration/test-external-dependency-solver-protocol
  25. +10
    -13
      test/integration/test-hashsum-verification
  26. +4
    -4
      test/integration/test-multiarch-foreign
  27. +4
    -2
      test/integration/test-parse-all-archs-into-cache
  28. +3
    -3
      test/integration/test-pin-non-existent-package
  29. +16
    -16
      test/integration/test-release-candidate-switching

+ 4
- 2
test/integration/framework View File

@@ -361,6 +361,7 @@ EOF
if ! command dpkg --assert-multi-arch >/dev/null 2>&1; then
echo "DPKG::options:: \"--force-architecture\";" # Added to test multiarch before dpkg is ready for it…
fi
echo 'quiet "0";'
echo 'quiet::NoUpdate "true";'
echo 'quiet::NoStatistic "true";'
# too distracting for users, but helpful to detect changes
@@ -973,8 +974,8 @@ generatereleasefiles() {
# both should be given in notation date/touch can understand
local DATE="$1"
local VALIDUNTIL="$2"
msgninfo "\tGenerate Release files… "
if [ -e aptarchive/dists ]; then
msgninfo "\tGenerate Release files for dists… "
for dir in $(find ./aptarchive/dists -mindepth 1 -maxdepth 1 -type d); do
local ARCHITECTURES="$(getarchitecturesfromreleasefile "$dir")"
local SUITE="$(echo "$dir" | cut -d'/' -f 4)"
@@ -996,6 +997,7 @@ NotAutomatic: yes' "$dir/Release"
fi
done
else
msgninfo "\tGenerate Release files for flat… "
aptftparchiverelease ./aptarchive > aptarchive/Release
fi
if [ -n "$DATE" -a "$DATE" != "now" ]; then
@@ -1399,7 +1401,7 @@ N: No packages found"
local ARCH="$(getarchitecture 'native')"
echo "$VIRTUAL" | sed -e "s/:$ARCH//" -e 's/:all//' >"$COMPAREFILE"
local OUTPUT="${TMPWORKINGDIRECTORY}/rootdir/tmp/testshowvirtual.output"
testoutputequal "$COMPAREFILE" aptcache show -q=0 "$PACKAGE"
testoutputequal "$COMPAREFILE" aptcache show "$PACKAGE"
msggroup
}



+ 3
- 4
test/integration/test-acquire-binary-all View File

@@ -22,7 +22,7 @@ testsuccess grep '_binary-all_Packages' lists.before

configarchitecture 'amd64' 'i386'
testsuccessequal "All packages are up to date.
N: Skipping acquire of configured file 'main/binary-i386/Packages' as repository 'file:$(readlink -f ./aptarchive) unstable InRelease' doesn't support architecture 'i386'" apt update -q=0 -o quiet::NoProgress=1
N: Skipping acquire of configured file 'main/binary-i386/Packages' as repository 'file:$(readlink -f ./aptarchive) unstable InRelease' doesn't support architecture 'i386'" apt update -o quiet::NoProgress=1
testfileequal lists.before "$(listcurrentlistsdirectory)"
testequal 'foo-1
foo-2' aptcache pkgnames foo-
@@ -32,8 +32,7 @@ msgmsg 'Releasefile with Architectures field but without all'
getarchitecturesfromreleasefile() { echo "$(getarchitectures)"; }
generatereleasefiles
signreleasefiles
testsuccessequal "All packages are up to date.
N: Skipping acquire of configured file 'main/binary-i386/Packages' as repository 'file:$(readlink -f ./aptarchive) unstable InRelease' doesn't support architecture 'i386'" apt update -q=0 -o quiet::NoProgress=1
testsuccessequal 'All packages are up to date.' apt update -o quiet::NoProgress=1
cp rootdir/tmp/testsuccess.output aptupdate.output
testfailure grep '^Get.* all Packages ' aptupdate.output
testequal 'foo-2' aptcache pkgnames foo-
@@ -57,7 +56,7 @@ foo-2' aptcache pkgnames foo-

# apt doesn't know supported archs, so missing a configured arch is a failure
configarchitecture 'amd64' 'i386'
testfailure apt update -q=0
testfailure apt update
testequal 'foo-1
foo-2' aptcache pkgnames foo-



+ 5
- 5
test/integration/test-apt-ftparchive-cachedb View File

@@ -69,7 +69,7 @@ buildsimplenativepackage 'foo' 'i386' '1' 'test'
mv incoming/* aptarchive/pool/main/

# generate (empty cachedb)
testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
testsuccess aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
@@ -77,7 +77,7 @@ testsuccessequal ' Misses in Cache: 2
dists/test/Contents-i386: New 402 B Misses in Cache: 0' grep Misses stats-out.txt

# generate again
testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
testsuccess aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
@@ -87,7 +87,7 @@ testsuccessequal ' Misses in Cache: 0
# and again (with removing the Packages file)
rm -f ./aptarchive/dists/test/main/binary-i386/*
rm -f ./aptarchive/dists/test/Contents-i386
testsuccess aptftparchive generate ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
testsuccess aptftparchive generate ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
cp rootdir/tmp/testsuccess.output stats-out.txt
ensure_correct_packages_file
ensure_correct_contents_file
@@ -96,8 +96,8 @@ testsuccessequal ' Misses in Cache: 0

# and clean
rm -rf aptarchive/pool/main/*
testsuccessequal "packages-main-i386.db" aptftparchive clean ftparchive.conf -q=0
testsuccess aptftparchive clean ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1
testsuccessequal "packages-main-i386.db" aptftparchive clean ftparchive.conf
testsuccess aptftparchive clean ftparchive.conf -o Debug::APT::FTPArchive::Clean=1
cp rootdir/tmp/testsuccess.output clean-out.txt
testsuccessequal "0 Number of unique keys in the tree" grep unique clean-out.txt
testsuccessequal "packages-main-i386.db" grep packages-main-i386.db clean-out.txt

+ 5
- 5
test/integration/test-apt-ftparchive-src-cachedb View File

@@ -109,7 +109,7 @@ mkdir aptarchive-cache

msgtest 'generate with --db option'
cd aptarchive
aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
aptftparchive --db ./test.db sources pool/main/ -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
testsuccess grep Misses stats-out.txt
testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 2'
cd ..
@@ -117,7 +117,7 @@ assert_correct_sources_file

msgtest 'generate with --db option (again to ensure its in the cache)'
cd aptarchive
aptftparchive --db ./test.db sources pool/main/ -q=0 -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
aptftparchive --db ./test.db sources pool/main/ -o APT::FTPArchive::ShowCacheMisses=1 > dists/test/main/source/Sources 2>stats-out.txt && msgpass || msgfail
testsuccess grep Misses stats-out.txt
testfileequal '../rootdir/tmp/testsuccess.output' ' Misses in Cache: 0'
cd ..
@@ -155,7 +155,7 @@ Tree "dists/test" {
EOF

msgtest 'generate (empty cachedb)'
testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
testsuccess aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
cp rootdir/tmp/testsuccess.output stats-out.txt
testsuccess grep Misses stats-out.txt
testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 2'
@@ -163,7 +163,7 @@ assert_correct_sources_file

msgtest 'generate again out of the cache'
rm -f ./aptarchive/dists/test/main/source/Sources
testsuccess aptftparchive generate apt-ftparchive.conf -q=0 -o APT::FTPArchive::ShowCacheMisses=1
testsuccess aptftparchive generate apt-ftparchive.conf -o APT::FTPArchive::ShowCacheMisses=1
cp rootdir/tmp/testsuccess.output stats-out.txt
testsuccess grep Misses stats-out.txt
testfileequal rootdir/tmp/testsuccess.output ' Misses in Cache: 0'
@@ -183,7 +183,7 @@ rm -f aptarchive/pool/invalid/invalid_1.0.dsc

# ensure clean works
rm -f aptarchive/pool/main/*
testsuccess aptftparchive clean apt-ftparchive.conf -q=0 -o Debug::APT::FTPArchive::Clean=1
testsuccess aptftparchive clean apt-ftparchive.conf -o Debug::APT::FTPArchive::Clean=1
cp rootdir/tmp/testsuccess.output clean-out.txt
testsuccess grep unique clean-out.txt
testfileequal 'rootdir/tmp/testsuccess.output' "0 Number of unique keys in the tree"


+ 1
- 1
test/integration/test-apt-get-download View File

@@ -31,7 +31,7 @@ find aptarchive/dists -name '*Release*' -type f | while read file; do
done
if [ "$(id -u)" = '0' ]; then
# Release file can't be accessed by _apt
testsuccesswithnotice aptget update -q=0
testsuccesswithnotice aptget update
fi

#everything (too) permissive


+ 6
- 6
test/integration/test-apt-get-install-deb View File

@@ -38,7 +38,7 @@ The following information may help to resolve the situation:
The following packages have unmet dependencies:
foo:i386 : Conflicts: foo but 1.0 is to be installed
foo : Conflicts: foo:i386 but 1.0 is to be installed
E: Unable to correct problems, you have held broken packages." aptget install ./incoming/foo_1.0_i386.deb ./incoming/foo_1.0_amd64.deb -s -q=0
E: Unable to correct problems, you have held broken packages." aptget install ./incoming/foo_1.0_i386.deb ./incoming/foo_1.0_amd64.deb -s

testdpkgnotinstalled 'foo'
testsuccess aptget install ./incoming/foo_1.0_i386.deb -o Debug::pkgCacheGen=1
@@ -55,7 +55,7 @@ The following NEW packages will be installed:
0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
Remv foo:i386 [1.0]
Inst foo (1.0 local-deb [amd64])
Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0
Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s

# Check that installing the local deb works if it is not the candidate
echo "Package: foo
@@ -73,7 +73,7 @@ The following NEW packages will be installed:
0 upgraded, 1 newly installed, 1 to remove and 0 not upgraded.
Remv foo:i386 [1.0]
Inst foo (1.0 local-deb [amd64])
Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s -q=0
Conf foo (1.0 local-deb [amd64])" aptget install ./incoming/foo_1.0_amd64.deb -s

createpkg() {
local PKG="pkg-$1"
@@ -108,9 +108,9 @@ testsuccess aptget install ./incoming/pkg-trailing-newline_0_all.deb
if [ "$(id -u)" = '0' ]; then
apt clean
chmod 711 ./incoming
testsuccess aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
testsuccess aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb
chmod 710 ./incoming
testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb
chmod 700 ./incoming
testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb -q=0
testsuccesswithnotice aptget install -y --allow-downgrades ./incoming/pkg-as-it-should-be_0_all.deb
fi

+ 3
- 3
test/integration/test-apt-get-install-virtual-pkgs View File

@@ -32,7 +32,7 @@ The following NEW packages will be installed:
foo
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foo (1 unstable [amd64])
Conf foo (1 unstable [amd64])" aptget install foo-prv -s -q=0
Conf foo (1 unstable [amd64])" aptget install foo-prv -s

testvirtuals() {
testfailureequal "Reading package lists...
@@ -42,7 +42,7 @@ Package $1 is a virtual package provided by:
$2
You should explicitly select one to install.

E: Package '$1' has no installation candidate" aptget install $1 -s -q=0
E: Package '$1' has no installation candidate" aptget install $1 -s
}

testvirtuals 'foo-prv1' 'baz1 1' 'foo1 1'
@@ -61,4 +61,4 @@ Package foo-prv5 is a virtual package provided by:
foo5:i386 2 [Not candidate version]
baz5 1 [Not candidate version]

E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s -q=0
E: Package 'foo-prv5' has no installation candidate" aptget install foo-prv5 -s

+ 2
- 2
test/integration/test-apt-get-update-unauth-warning View File

@@ -35,7 +35,7 @@ Err:2 file:$APTARCHIVE unstable Release
Reading package lists...
E: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file.
N: Updating such a repository securily is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --no-allow-insecure-repositories -q=0
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --no-allow-insecure-repositories

# no package foo
testsuccessequal 'Listing...' apt list foo
@@ -85,7 +85,7 @@ Get:6 file:$APTARCHIVE unstable/main Translation-en [$(filesize 'Translations')
Reading package lists...
W: The repository 'file:$APTARCHIVE unstable Release' does not have a Release file.
N: Data from such a repository can not be authenticated and is therefore potentially dangerous to use.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --allow-insecure-repositories -q=0
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update --allow-insecure-repositories
# ensure we can not install the package
testfailureequal "WARNING: The following packages cannot be authenticated!
foo


+ 3
- 3
test/integration/test-apt-helper View File

@@ -95,6 +95,6 @@ testfailureequal 'E: Must specify at least one pair url/filename' apthelper down
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
testfailureequal 'E: Must specify at least one SRV record' apthelper srv-lookup
testfailureequal 'E: GetSrvRec failed for localhost' apthelper srv-lookup 'localhost'
testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPPORT}" apthelper srv-lookup "localhost:${APTHTTPPORT}"
testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPSPORT}" apthelper srv-lookup "localhost:${APTHTTPSPORT}"
testfailureequal 'E: GetSrvRec failed for localhost' apthelper -q=1 srv-lookup 'localhost'
testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPPORT}" apthelper -q=1 srv-lookup "localhost:${APTHTTPPORT}"
testfailureequal "E: GetSrvRec failed for localhost:${APTHTTPSPORT}" apthelper -q=1 srv-lookup "localhost:${APTHTTPSPORT}"

+ 7
- 7
test/integration/test-apt-mark View File

@@ -20,7 +20,7 @@ testdpkginstalled dpkg

testnoautopkg() {
testempty aptmark showauto
testempty aptcache showauto
testempty aptcache -q=1 showauto
testsuccessequal 'bar
dpkg
foo' aptmark showmanual
@@ -29,22 +29,22 @@ foo' aptmark showmanual bar foo uninstalled
}
testfooisauto() {
testsuccessequal 'foo' aptmark showauto
testsuccessequal 'foo' aptcache showauto
testsuccessequal 'foo' aptcache -q=1 showauto
testsuccessequal 'foo' aptmark showauto foo
testsuccessequal 'foo' aptcache showauto foo
testsuccessequal 'foo' aptcache -q=1 showauto foo
testsuccessequal 'bar
dpkg' aptmark showmanual
testsuccessequal 'bar' aptmark showmanual bar
}
testmarkonpkgasauto() {
testsuccess $1 $2 foo
testsuccess $1 -q=1 $2 foo
testfooisauto
testsuccess $1 $2 foo
testsuccess $1 -q=1 $2 foo
testfooisauto

testsuccess $1 $3 foo
testsuccess $1 -q=1 $3 foo
testnoautopkg
testsuccess $1 $3 foo
testsuccess $1 -q=1 $3 foo
testnoautopkg
}



+ 6
- 3
test/integration/test-apt-update-failure-propagation View File

@@ -28,7 +28,7 @@ done

pretest() {
rm -rf rootdir/var/lib/apt/lists
testsuccessequal 'N: Unable to locate package foo' aptcache policy foo -q=0
testsuccessequal 'N: Unable to locate package foo' aptcache policy foo
}
pretest
testsuccess aptget update
@@ -43,8 +43,10 @@ testsuccessequal "foo:

pretest
mv aptarchive/dists/stable aptarchive/dists/stable.good
testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file." apt update
testfailure aptget update -q=0 --no-allow-insecure-repositories
testfailuremsg "E: The repository 'https://localhost:${APTHTTPSPORT} stable Release' does not have a Release file.
N: Updating such a repository securily is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." apt update
testfailure aptget update --no-allow-insecure-repositories
testequalor2 "Hit:1 http://localhost:${APTHTTPPORT} sid InRelease
Ign:2 https://localhost:${APTHTTPSPORT} stable InRelease
404 Not Found
@@ -77,6 +79,7 @@ posttest
pretest
rm "${NEWMETHODS}/https"
testfailuremsg "E: The method driver ${TMPWORKINGDIRECTORY}/rootdir/usr/lib/apt/methods/https could not be found.
N: Is the package apt-transport-https installed?
W: Failed to fetch https://localhost:${APTHTTPSPORT}/dists/stable/InRelease
E: Some index files failed to download. They have been ignored, or old ones used instead." aptget update
posttest


+ 2
- 2
test/integration/test-apt-update-file View File

@@ -33,10 +33,10 @@ if [ "$(id -u)" = '0' ]; then
testsuccess aptget update
rm -rf rootdir/var/lib/apt/lists
chmod 510 aptarchive/dists/
testsuccesswithnotice aptget update -q=0
testsuccesswithnotice aptget update
rm -rf rootdir/var/lib/apt/lists
chmod 500 aptarchive/dists/
testsuccesswithnotice aptget update -q=0
testsuccesswithnotice aptget update
exit
fi
chmod 555 aptarchive/dists/unstable/main/binary-all


+ 1
- 1
test/integration/test-apt-update-ims View File

@@ -39,7 +39,7 @@ runtest() {

# check that I-M-S header is kept in redirections
echo "$EXPECT" | sed -e 's#(invalid since [^)]\+)#(invalid since)#' > expected.output
$TEST aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0 -q=0 $APTOPT
$TEST aptget update -o Debug::pkgAcquire::Worker=0 -o Debug::Acquire::http=0 $APTOPT
sed -i -e 's#(invalid since [^)]\+)#(invalid since)#' rootdir/tmp/${TEST}.output
testequal "$(cat expected.output)" cat rootdir/tmp/${TEST}.output
testfileequal 'listsdir.lst' "$(listcurrentlistsdirectory)"


+ 1
- 1
test/integration/test-apt-update-nofallback View File

@@ -35,7 +35,7 @@ assert_update_is_refused_and_last_good_state_used()
{
testfailuremsg "E: The repository 'file:${APTARCHIVE} unstable Release' is no longer signed.
N: Updating such a repository securily is impossible and therefore disabled by default.
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update -q=0
N: See apt-secure(8) manpage for repository creation and user configuration details." aptget update

assert_repo_is_intact
}


+ 1
- 0
test/integration/test-authentication-basic View File

@@ -9,6 +9,7 @@ configarchitecture 'i386'

insertpackage 'unstable' 'foo' 'all' '1'
setupaptarchive --no-update
exit

changetohttpswebserver --authorization="$(printf '%s' 'star:hunter2' | base64 )"



+ 17
- 12
test/integration/test-bug-612099-multiarch-conflicts View File

@@ -54,9 +54,10 @@ Inst foobar:amd64 (1.0 stable [amd64])
Conf libc6:amd64 (1.0 stable [amd64])
Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64 -st stable

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [i386]) for 'foobar'
The following NEW packages will be installed:
foobar
The following packages will be upgraded:
@@ -65,7 +66,7 @@ The following packages will be upgraded:
Inst libc6 [1.0] (2.0 testing [all])
Inst foobar (1.0 stable [i386])
Conf libc6 (2.0 testing [all])
Conf foobar (1.0 stable [i386])' aptget install foobar/stable libc6 -st testing
Conf foobar (1.0 stable [i386])" aptget install foobar/stable libc6 -st testing

testsuccessequal 'Reading package lists...
Building dependency tree...
@@ -84,18 +85,20 @@ testsuccess aptget purge libc6 -y
testsuccess aptget install libc6:i386 -y
testdpkginstalled libc6:all

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [i386]) for 'foobar'
The following NEW packages will be installed:
foobar
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foobar (1.0 stable [i386])
Conf foobar (1.0 stable [i386])' aptget install foobar/stable -st testing
Conf foobar (1.0 stable [i386])" aptget install foobar/stable -st testing

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [amd64]) for 'foobar:amd64'
The following additional packages will be installed:
libc6:amd64
The following packages will be REMOVED:
@@ -107,7 +110,7 @@ Remv libc6 [2.0]
Inst libc6:amd64 (1.0 stable [amd64])
Inst foobar:amd64 (1.0 stable [amd64])
Conf libc6:amd64 (1.0 stable [amd64])
Conf foobar:amd64 (1.0 stable [amd64])' aptget install foobar:amd64/stable -st testing
Conf foobar:amd64 (1.0 stable [amd64])" aptget install foobar:amd64/stable -st testing


testsuccessequal "Reading package lists...
@@ -118,7 +121,7 @@ The following packages will be DOWNGRADED:
libc6
0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded.
Inst libc6 [2.0] (1.0 stable [i386])
Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s -q=0
Conf libc6 (1.0 stable [i386])" aptget install libc6/stable -s


buildsimplenativepackage 'libc6-same' 'i386' '1.0' 'stable' 'Multi-Arch: same'
@@ -192,20 +195,22 @@ The following packages will be DOWNGRADED:
libc6-same
0 upgraded, 0 newly installed, 1 downgraded, 0 to remove and 0 not upgraded.
Inst libc6-same [2.0] (1.0 stable [i386])
Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s -q=0
Conf libc6-same (1.0 stable [i386])" aptget install libc6-same/stable -s

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [i386]) for 'foobar-same'
The following NEW packages will be installed:
foobar-same
0 upgraded, 1 newly installed, 0 to remove and 0 not upgraded.
Inst foobar-same (1.0 stable [i386])
Conf foobar-same (1.0 stable [i386])' aptget install foobar-same/stable -st testing
Conf foobar-same (1.0 stable [i386])" aptget install foobar-same/stable -st testing

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Reading state information...
Selected version '1.0' (stable [amd64]) for 'foobar-same:amd64'
The following additional packages will be installed:
libc6-same:amd64
The following packages will be REMOVED:
@@ -217,4 +222,4 @@ Remv libc6-same [2.0]
Inst libc6-same:amd64 (1.0 stable [amd64])
Inst foobar-same:amd64 (1.0 stable [amd64])
Conf libc6-same:amd64 (1.0 stable [amd64])
Conf foobar-same:amd64 (1.0 stable [amd64])' aptget install foobar-same:amd64/stable -st testing
Conf foobar-same:amd64 (1.0 stable [amd64])" aptget install foobar-same:amd64/stable -st testing

+ 1
- 1
test/integration/test-bug-683786-build-dep-on-virtual-packages View File

@@ -30,7 +30,7 @@ Reverse Depends:
Dependencies:
Provides:
Reverse Provides: ' aptcache showpkg po-debconf:armel
testsuccessequal 'N: Unable to locate package texi2html:armel' aptcache showpkg texi2html:armel -q=0
testsuccessequal 'N: Unable to locate package texi2html:armel' aptcache showpkg texi2html:armel

testsuccessequal 'Reading package lists...
Building dependency tree...


+ 1
- 1
test/integration/test-bug-738785-switch-protocol View File

@@ -53,7 +53,7 @@ rm "$NEWMETHODS/https"

cd downloaded
testfailureequal "E: The method driver $(readlink -f './../')/rootdir/usr/lib/apt/methods/https could not be found.
N: Is the package apt-transport-https installed?" aptget download apt -q=0
N: Is the package apt-transport-https installed?" aptget download apt
testfailure test -e apt_1.0_all.deb
cd - >/dev/null



+ 2
- 1
test/integration/test-bug-753297-upgradable View File

@@ -26,7 +26,8 @@ insertpackage 'testing' 'bar' 'all' '2'
setupaptarchive

testsuccessequal "Listing...
bar/testing 2 all [upgradable from: 1]" apt list --upgradable
bar/testing 2 all [upgradable from: 1]
N: There is 1 additional version. Please use the '-a' switch to see it" apt list --upgradable

testsuccessequal "Listing...
bar/testing 2 all [upgradable from: 1]


+ 2
- 2
test/integration/test-bug-758153-versioned-provides-support View File

@@ -196,7 +196,7 @@ The following NEW packages will be installed:
Inst foo (1 unstable [all])
Inst baz (2 experimental [amd64])
Conf foo (1 unstable [all])
Conf baz (2 experimental [amd64])" aptget install baz/experimental -s -q=0
Conf baz (2 experimental [amd64])" aptget install baz/experimental -s

testsuccessequal "Reading package lists...
Building dependency tree...
@@ -209,7 +209,7 @@ The following NEW packages will be installed:
Inst foo (1 unstable [all])
Inst baz:i386 (2 experimental [i386])
Conf foo (1 unstable [all])
Conf baz:i386 (2 experimental [i386])" aptget install baz:i386/experimental -s -q=0
Conf baz:i386 (2 experimental [i386])" aptget install baz:i386/experimental -s

testfailureequal 'Reading package lists...
Building dependency tree...


+ 3
- 3
test/integration/test-conflicts-real-multiarch-same View File

@@ -26,7 +26,7 @@ The following NEW packages will be installed:
Inst virtual-provider (2 unstable [amd64])
Inst virtual-provider:i386 (2 unstable [i386])
Conf virtual-provider (2 unstable [amd64])
Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s -q=0
Conf virtual-provider:i386 (2 unstable [i386])" aptget install virtual:* -s

testsuccessequal 'Reading package lists...
Building dependency tree...
@@ -36,7 +36,7 @@ The following NEW packages will be installed:
Inst real (2 unstable [amd64])
Inst real:i386 (2 unstable [i386])
Conf real (2 unstable [amd64])
Conf real:i386 (2 unstable [i386])' aptget install real:* -s -q=0
Conf real:i386 (2 unstable [i386])' aptget install real:* -s

# ensure that we are not confused by the provides
testsuccessequal 'Reading package lists...
@@ -47,4 +47,4 @@ The following NEW packages will be installed:
Inst real-provider (2 unstable [amd64])
Inst real-provider:i386 (2 unstable [i386])
Conf real-provider (2 unstable [amd64])
Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s -q=0
Conf real-provider:i386 (2 unstable [i386])' aptget install real-provider:* -s

+ 1
- 1
test/integration/test-cve-2013-1051-InRelease-parsing View File

@@ -55,7 +55,7 @@ Building dependency tree...
E: Unable to locate package bad-mitm' aptget install bad-mitm -s

# and verify that its not picked up
testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm -q=0
testsuccessequal 'N: Unable to locate package bad-mitm' aptcache policy bad-mitm

# and that the right one is used
testsuccessequal "good-pkg:


+ 1
- 1
test/integration/test-disappearing-packages View File

@@ -33,7 +33,7 @@ testsuccess aptget install old-pkg=1.0 --trivial-only

testmarkedauto # old-pkg is manual installed

CMD='aptget dist-upgrade -y -q=0'
CMD='aptget dist-upgrade -y'
msgtest 'Test for equality of' "$CMD"
COMPAREFILE="$(mktemp)"
echo 'The following package disappeared from your system as


+ 2
- 2
test/integration/test-external-dependency-solver-protocol View File

@@ -139,14 +139,14 @@ testsuccess grep 'ERR_UNSOLVABLE' rootdir/tmp/testfailure.output
configarchitecture 'armel'
testfailure aptget install --solver apt awesomecoolstuff:i386 -s
msgtest 'An invalid EDSP file generates a' 'hard error'
if echo "Request: This is a test\nFoo: bar\n\n" | aptinternalsolver -q=0 > solver.result 2>&1; then
if echo "Request: This is a test\nFoo: bar\n\n" | aptinternalsolver > solver.result 2>&1; then
cat solver.result
msgfail
else
msgpass
fi
msgtest 'Test direct calling is okay for' 'apt-internal-solver'
cat "$APT_EDSP_DUMP_FILENAME" | aptinternalsolver -q=0 > solver.result 2>&1 || true
cat "$APT_EDSP_DUMP_FILENAME" | aptinternalsolver > solver.result 2>&1 || true
if [ "$(tail -n2 solver.result | head -n1 )" = "Message: Done" ]; then
msgpass
else


+ 10
- 13
test/integration/test-hashsum-verification View File

@@ -58,25 +58,22 @@ runtest() {
signreleasefiles 'Joe Sixpack'
find aptarchive/ -name "$DELETEFILE" -delete

# test signed release file
msgtest 'apt-get update gets the expected hashsum mismatch'
aptget update 2>&1 | grep "Hash Sum mismatch" > /dev/null && msgpass || msgfail
msgtest 'No package from the source available'
[ "$(aptcache show apt 2>&1)" = "E: No packages found" ] && msgpass || msgfail
# test signed release file
msgtest 'apt-get update gets the expected hashsum mismatch'
testfailure aptget update
testsuccess grep "Hash Sum mismatch" rootdir/tmp/testfailure.output
msgtest 'No package from the source available'
testfailureequal --nomsg 'N: Unable to locate package apt
E: No packages found' aptcache show apt
msgtest 'No Packages file in /var/lib/apt/lists'
[ "$(ls rootdir/var/lib/apt/lists/*Package* 2>/dev/null | grep -v FAILED 2>/dev/null)" = "" ] && msgpass || msgfail
# now with the unsigned Release file
rm -rf rootdir/var/lib/apt/lists
rm aptarchive/InRelease aptarchive/Release.gpg
msgtest 'unsigned apt-get update gets the expected hashsum mismatch'
aptget update --allow-insecure-repositories >output.log 2>&1 || true
if grep -q "Hash Sum mismatch" output.log; then
msgpass
else
cat output.log
msgfail
fi
msgtest 'unsigned apt-get update gets the expected hashsum mismatch'
testfailure --nomsg aptget update --allow-insecure-repositories
testsuccess grep "Hash Sum mismatch" rootdir/tmp/testfailure.output
}

for COMPRESSEDINDEXES in 'false' 'true'; do


+ 4
- 4
test/integration/test-multiarch-foreign View File

@@ -98,7 +98,7 @@ The following NEW packages will be installed:
Inst bar:i386 (1.0 unstable [i386])
Inst cool-bar (1.0 unstable [amd64])
Conf bar:i386 (1.0 unstable [i386])
Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s -q=0
Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider:i386 -s

satisfiable_in_singlearch() {
testsuccessequal 'Reading package lists...
@@ -154,7 +154,7 @@ The following NEW packages will be installed:
Inst bar (1.0 unstable [amd64])
Inst cool-bar (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s -q=0
Conf cool-bar (1.0 unstable [amd64])" aptget install cool-bar bar-provider -s

testsuccessequal 'Reading package lists...
Building dependency tree...
@@ -223,7 +223,7 @@ The following NEW packages will be installed:
Inst bar:i386 (1.0 unstable [i386])
Inst cool-bar-x32 (1.0 unstable [amd64])
Conf bar:i386 (1.0 unstable [i386])
Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s -q=0
Conf cool-bar-x32 (1.0 unstable [amd64])' aptget install cool-bar-x32 -s

testsuccessequal 'Reading package lists...
Building dependency tree...
@@ -235,7 +235,7 @@ The following NEW packages will be installed:
Inst bar (1.0 unstable [amd64])
Inst cool-bar-x64 (1.0 unstable [amd64])
Conf bar (1.0 unstable [amd64])
Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s -q=0
Conf cool-bar-x64 (1.0 unstable [amd64])' aptget install cool-bar-x64 -s


satisfiable_in_singlearch


+ 4
- 2
test/integration/test-parse-all-archs-into-cache View File

@@ -47,8 +47,10 @@ Inst foo (1 unstable [i386])
Conf libfoo1 (1 unstable [i386])
Conf foo (1 unstable [i386])' aptget install foo -s

testsuccessequal 'Reading package lists...
testsuccessequal "Reading package lists...
Building dependency tree...
Selected version '2' (experimental [i386]) for 'foo'
Selected version '2' (experimental [i386]) for 'libfoo1' because of 'foo'
The following additional packages will be installed:
libfoo1
The following packages will be REMOVED:
@@ -61,7 +63,7 @@ Remv libfoo1:amd64 [1]
Inst libfoo1 (2 experimental [i386])
Inst foo (2 experimental [i386])
Conf libfoo1 (2 experimental [i386])
Conf foo (2 experimental [i386])' aptget install foo/experimental -s
Conf foo (2 experimental [i386])" aptget install foo/experimental -s

testsuccessequal 'Reading package lists...
Building dependency tree...


+ 3
- 3
test/integration/test-pin-non-existent-package View File

@@ -23,7 +23,7 @@ testcandidate() {
}

testcandidate rapt '0.8.15'
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
@@ -34,7 +34,7 @@ Pin: release a=unstable
Pin-Priority: -1' > rootdir/etc/apt/preferences

testcandidate rapt '(none)'
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist
testsuccessequal 'Reading package lists...
Building dependency tree...
Calculating upgrade...
@@ -53,7 +53,7 @@ Pin: release a=unstable
Pin-Priority: 1000' >> rootdir/etc/apt/preferences

testcandidate rapt '(none)'
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist -q=0
testsuccessequal 'N: Unable to locate package doesntexist' aptcache policy doesntexist

testsuccessequal 'Reading package lists...
Building dependency tree...


+ 16
- 16
test/integration/test-release-candidate-switching View File

@@ -71,7 +71,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0really4.4.2-1+sid)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok --trivial-only -V

testfailureequal "Reading package lists...
Building dependency tree...
@@ -90,7 +90,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0+exp)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok -t experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok -t experimental --trivial-only -V

testfailureequal "Reading package lists...
Building dependency tree...
@@ -112,7 +112,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0really4.4.2-1+sid)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental --trivial-only -V

testfailureequal "Reading package lists...
Building dependency tree...
@@ -134,7 +134,7 @@ The following NEW packages will be installed:
phonon-backend-null (4.20.0+sid)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null/experimental --trivial-only -V

# do not select the same version multiple times
testfailureequal "Reading package lists...
@@ -159,7 +159,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0really4.4.2-1+sid)
0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
After this operation, 301 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental amarok-null/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok/experimental amarok-null/experimental --trivial-only -V

# … but thighten the version if needed
# in theory, the second line is wrong, but printing the right version is too much of a hassle
@@ -189,7 +189,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0+exp)
0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
After this operation, 301 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-less/experimental2 amarok-higher/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-less/experimental2 amarok-higher/experimental --trivial-only -V

# phonon-backend-null can't be used directly, but as it provides it is still fine…
testfailureequal "Reading package lists...
@@ -212,7 +212,7 @@ The following NEW packages will be installed:
phonon-backend-null (4.20.0+sid)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null2/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-null2/experimental --trivial-only -V

# if an or-group satisfier is already found, do not set others
testfailureequal "Reading package lists...
@@ -236,7 +236,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0+exp)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine/experimental --trivial-only -V

# … but proceed testing if the first doesn't work out
testfailureequal "Reading package lists...
@@ -260,7 +260,7 @@ The following NEW packages will be installed:
phonon-backend-null (4.20.0+exp)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine2/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine2/experimental --trivial-only -V

# sometimes, the second level need to be corrected, too
testfailureequal "Reading package lists...
@@ -287,7 +287,7 @@ The following NEW packages will be installed:
phonon-backend-xine3 (4.6.0+exp)
0 upgraded, 7 newly installed, 0 to remove and 0 not upgraded.
After this operation, 301 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine3/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine3/experimental --trivial-only -V

# … but proceed testing if the first doesn't work out even in second deep
testfailureequal "Reading package lists...
@@ -311,7 +311,7 @@ The following NEW packages will be installed:
phonon-backend-null (4.20.0+exp)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine4/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-xine4/experimental --trivial-only -V

# providers can be broken, too
testfailureequal "Reading package lists...
@@ -335,7 +335,7 @@ The following NEW packages will be installed:
phonon-backend-null (4.20.0+exp)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-broken/experimental --trivial-only -V -q=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-broken/experimental --trivial-only -V

# switch the candidate for recommends too if they should be installed
testfailureequal "Reading package lists...
@@ -358,7 +358,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0really4.4.2-1+sid)
0 upgraded, 6 newly installed, 0 to remove and 0 not upgraded.
After this operation, 258 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -q=0 -o APT::Install-Recommends=1
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -o APT::Install-Recommends=1

# … or not if not
testfailureequal "Reading package lists...
@@ -378,7 +378,7 @@ The following NEW packages will be installed:
amarok-recommends (2.3.2-2+exp)
0 upgraded, 2 newly installed, 0 to remove and 0 not upgraded.
After this operation, 86.0 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -q=0 -o APT::Install-Recommends=0
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends/experimental --trivial-only -V -o APT::Install-Recommends=0

# but broken recommends are not the end of the world
# FIXME: the version output for recommend packages is a bit strange… but what would be better?
@@ -401,7 +401,7 @@ The following NEW packages will be installed:
phonon-backend-xine (4.6.0really4.4.2-1+sid)
0 upgraded, 5 newly installed, 0 to remove and 0 not upgraded.
After this operation, 215 kB of additional disk space will be used.
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends2/experimental --trivial-only -V -q=0 -o APT::Install-Recommends=1
E: Trivial Only specified but this is not a trivial operation." aptget install amarok-recommends2/experimental --trivial-only -V -o APT::Install-Recommends=1

# if one depends doesn't work, we don't need to look deeper…
testfailureequal "Reading package lists...
@@ -416,4 +416,4 @@ The following information may help to resolve the situation:
The following packages have unmet dependencies:
uninstallablepkg : Depends: libmtp8 (>= 10:0.20.1) but it is not going to be installed
Depends: amarok-utils (= 2.3.2-2+exp) but 2.3.1-1+sid is to be installed
E: Unable to correct problems, you have held broken packages." aptget install uninstallablepkg/experimental --trivial-only -V -q=0
E: Unable to correct problems, you have held broken packages." aptget install uninstallablepkg/experimental --trivial-only -V

Loading…
Cancel
Save