tests: use quiet level 0 by default in tests

Git-Dch: Ignore

diff --git a/test/integration/framework b/test/integration/framework
index 49525cbd091c1d9b6110ee83ad20a20fbe5399bc..7a56a9acd08c202051b08baed1f017b7e800e876 100644 (file)
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -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
 }
 

diff --git a/test/integration/test-acquire-binary-all b/test/integration/test-acquire-binary-all
index 478bf1a283f8a63423e12167d8412e4c300de7ad..c8f90f26d51afa4a79f6eae98d93e58a5501fab5 100755 (executable)
--- a/test/integration/test-acquire-binary-all
+++ b/test/integration/test-acquire-binary-all
@@ -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-
 

diff --git a/test/integration/test-apt-ftparchive-cachedb b/test/integration/test-apt-ftparchive-cachedb
index 4edf26c220ce8ce0c9e7d12cf5360c3f051dbc08..889e45cbec1d977d3b2df970d1bc31357827c605 100755 (executable)
--- a/test/integration/test-apt-ftparchive-cachedb
+++ b/test/integration/test-apt-ftparchive-cachedb
@@ -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

diff --git a/test/integration/test-apt-ftparchive-src-cachedb b/test/integration/test-apt-ftparchive-src-cachedb
index 06f5bdd9dfb31bdfeb04d877163252af46479c77..31af1e11e19cbe70584913562b30d144020107b0 100755 (executable)
--- a/test/integration/test-apt-ftparchive-src-cachedb
+++ b/test/integration/test-apt-ftparchive-src-cachedb
@@ -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"

diff --git a/test/integration/test-apt-get-download b/test/integration/test-apt-get-download
index 3ad3b395de8709a22cd00366cde21656a6472237..78386aa7f12087c917c6088e20305578900123fa 100755 (executable)
--- a/test/integration/test-apt-get-download
+++ b/test/integration/test-apt-get-download
@@ -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

diff --git a/test/integration/test-apt-get-install-deb b/test/integration/test-apt-get-install-deb
index 3f1aee5a0cf5dc0f330d42adc856d2878016575e..21cd86e9d8d3d0a2bdb6533dce090f0d9396a90f 100755 (executable)
--- a/test/integration/test-apt-get-install-deb
+++ b/test/integration/test-apt-get-install-deb
@@ -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

diff --git a/test/integration/test-apt-get-install-virtual-pkgs b/test/integration/test-apt-get-install-virtual-pkgs
index ca3790f4636196486b2a8fb1d293319a61ac1401..c785205ee47c384b2f7f3a5b1a355982336c4eaa 100755 (executable)
--- a/test/integration/test-apt-get-install-virtual-pkgs
+++ b/test/integration/test-apt-get-install-virtual-pkgs
@@ -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

diff --git a/test/integration/test-apt-get-update-unauth-warning b/test/integration/test-apt-get-update-unauth-warning
index d71569827f31b30d0ee39c88cf57944df857b551..795e0f39e4527e620c2d9d6888ac1ab477854747 100755 (executable)
--- a/test/integration/test-apt-get-update-unauth-warning
+++ b/test/integration/test-apt-get-update-unauth-warning
@@ -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

diff --git a/test/integration/test-apt-helper b/test/integration/test-apt-helper
index b78201ef0fcb4f0454d335093eedef4102fb97a7..a0454a5a21fa38987ed3898cbec958d0826dedcb 100755 (executable)
--- a/test/integration/test-apt-helper
+++ b/test/integration/test-apt-helper
@@ -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}"

diff --git a/test/integration/test-apt-mark b/test/integration/test-apt-mark
index 47ade45b1ea091339e8924f1af2ee21103f84cf6..6a5e11e3e71c357de292e1100d02835352c16882 100755 (executable)
--- a/test/integration/test-apt-mark
+++ b/test/integration/test-apt-mark
@@ -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
 }
 

diff --git a/test/integration/test-apt-update-failure-propagation b/test/integration/test-apt-update-failure-propagation
index f144e9968a06c7ddeec74e0aa5a379319dfc087d..b68d850444cabe00e10cdec7791cac067d23ba4b 100755 (executable)
--- a/test/integration/test-apt-update-failure-propagation
+++ b/test/integration/test-apt-update-failure-propagation
@@ -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

diff --git a/test/integration/test-apt-update-file b/test/integration/test-apt-update-file
index 78a8ca4054fe78dacd7b5fd1aa22b6656e332e64..c5b237257909931c3881b4b57ffd7fd3f7f9e428 100755 (executable)
--- a/test/integration/test-apt-update-file
+++ b/test/integration/test-apt-update-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

diff --git a/test/integration/test-apt-update-ims b/test/integration/test-apt-update-ims
index 8b29fdbb9da2e0b3ddb70e7c77df0af32b7e6947..7477525409d46ff8078d748e391cba6fc9b61713 100755 (executable)
--- a/test/integration/test-apt-update-ims
+++ b/test/integration/test-apt-update-ims
@@ -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)"

diff --git a/test/integration/test-apt-update-nofallback b/test/integration/test-apt-update-nofallback
index a12a08ab1cc38bc91f963ac725863e25f3bb9976..89b197129353d0e9805a004851b0486d646170bb 100755 (executable)
--- a/test/integration/test-apt-update-nofallback
+++ b/test/integration/test-apt-update-nofallback
@@ -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
 }

diff --git a/test/integration/test-authentication-basic b/test/integration/test-authentication-basic
index e6dfc0272ecb4f01db3352e732561f3430ec8307..b27c80e90409a6f11eeb70574d3754cbc42f1b83 100755 (executable)
--- a/test/integration/test-authentication-basic
+++ b/test/integration/test-authentication-basic
@@ -9,6 +9,7 @@ configarchitecture 'i386'
 
 insertpackage 'unstable' 'foo' 'all' '1'
 setupaptarchive --no-update
+exit
 
 changetohttpswebserver --authorization="$(printf '%s' 'star:hunter2' | base64 )"
 

diff --git a/test/integration/test-bug-612099-multiarch-conflicts b/test/integration/test-bug-612099-multiarch-conflicts
index af839155595c23173e6fc27787bf3b5e20fd3aae..11ec284c439801cd0f2fb67b7041807fee314621 100755 (executable)
--- a/test/integration/test-bug-612099-multiarch-conflicts
+++ b/test/integration/test-bug-612099-multiarch-conflicts
@@ -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

diff --git a/test/integration/test-bug-683786-build-dep-on-virtual-packages b/test/integration/test-bug-683786-build-dep-on-virtual-packages
index 0ee76ea03d9c0efca42021e4e7dcf2853596d6be..a737102599c89add46fee70c2ec634115e7b7c95 100755 (executable)
--- a/test/integration/test-bug-683786-build-dep-on-virtual-packages
+++ b/test/integration/test-bug-683786-build-dep-on-virtual-packages
@@ -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...

diff --git a/test/integration/test-bug-738785-switch-protocol b/test/integration/test-bug-738785-switch-protocol
index 23578d85a7fa41f82435a1272e9f66b9b4e505fe..2f8a7ae5df8fac10f3546e937479491d3e5c104d 100755 (executable)
--- a/test/integration/test-bug-738785-switch-protocol
+++ b/test/integration/test-bug-738785-switch-protocol
@@ -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
 

diff --git a/test/integration/test-bug-753297-upgradable b/test/integration/test-bug-753297-upgradable
index 53bf3361beeddfc14c6521184b97e4bb76476b4a..ce2a483435d3a8b2b72303c48ec9896c177666b6 100755 (executable)
--- a/test/integration/test-bug-753297-upgradable
+++ b/test/integration/test-bug-753297-upgradable
@@ -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]

diff --git a/test/integration/test-bug-758153-versioned-provides-support b/test/integration/test-bug-758153-versioned-provides-support
index af8c863bb3a27185702812435d2607400602dc99..d6e5ab6435bf340df2de66bc048a000edf90dc33 100755 (executable)
--- a/test/integration/test-bug-758153-versioned-provides-support
+++ b/test/integration/test-bug-758153-versioned-provides-support
@@ -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...

diff --git a/test/integration/test-conflicts-real-multiarch-same b/test/integration/test-conflicts-real-multiarch-same
index e6c6c0e01e42005a739785cc9d4d3f1d95e30332..dd320aa8aa98ab750515ec380ce8fc5024881020 100755 (executable)
--- a/test/integration/test-conflicts-real-multiarch-same
+++ b/test/integration/test-conflicts-real-multiarch-same
@@ -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

diff --git a/test/integration/test-cve-2013-1051-InRelease-parsing b/test/integration/test-cve-2013-1051-InRelease-parsing
index 83e0db968857062865ab2a7b049c44943171f41f..604599caa4c1a68002b96db7559d5bbd5ffbac16 100755 (executable)
--- a/test/integration/test-cve-2013-1051-InRelease-parsing
+++ b/test/integration/test-cve-2013-1051-InRelease-parsing
@@ -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:

diff --git a/test/integration/test-disappearing-packages b/test/integration/test-disappearing-packages
index ffe692c100187ad751b9d6dca1543398ee3e4c7a..b922d2f72786ac412da49f7b2a6394910ed04ce7 100755 (executable)
--- a/test/integration/test-disappearing-packages
+++ b/test/integration/test-disappearing-packages
@@ -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

diff --git a/test/integration/test-external-dependency-solver-protocol b/test/integration/test-external-dependency-solver-protocol
index 2657e2f4239527b3cc6291912aa37d261081f98c..995215009e1ab160c76c2d4226468c3814da32d3 100755 (executable)
--- a/test/integration/test-external-dependency-solver-protocol
+++ b/test/integration/test-external-dependency-solver-protocol
@@ -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

diff --git a/test/integration/test-hashsum-verification b/test/integration/test-hashsum-verification
index 5f88110b3f13cdc2f55c53460be57dcf301d5272..21ca8783678341aaba1cb1ba53d4fad39c94286a 100755 (executable)
--- a/test/integration/test-hashsum-verification
+++ b/test/integration/test-hashsum-verification
@@ -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

diff --git a/test/integration/test-multiarch-foreign b/test/integration/test-multiarch-foreign
index 8c09a7fdeff8ab8317c756024179e6760b64b4d6..ad956dcdb48f85344be8e89e1c90ca46a38ad757 100755 (executable)
--- a/test/integration/test-multiarch-foreign
+++ b/test/integration/test-multiarch-foreign
@@ -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

diff --git a/test/integration/test-parse-all-archs-into-cache b/test/integration/test-parse-all-archs-into-cache
index 7741563e3a0c81a1a080aeab8526a8d6cd5e0c3b..f2a349b5d9fd626d06f986617e178f2bef5cccd3 100755 (executable)
--- a/test/integration/test-parse-all-archs-into-cache
+++ b/test/integration/test-parse-all-archs-into-cache
@@ -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...

diff --git a/test/integration/test-pin-non-existent-package b/test/integration/test-pin-non-existent-package
index 5c839283f2456c4bc0e35c1bfc564b645919433a..bcbe103d71dc61d95457a6ded5fcdb526c767508 100755 (executable)
--- a/test/integration/test-pin-non-existent-package
+++ b/test/integration/test-pin-non-existent-package
@@ -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...

diff --git a/test/integration/test-release-candidate-switching b/test/integration/test-release-candidate-switching
index 1790e838183b9bebb19e58b633e4d408ba173a32..15b9344ef99a0b50b3c58fbdfd55e3305ccef546 100755 (executable)
--- a/test/integration/test-release-candidate-switching
+++ b/test/integration/test-release-candidate-switching
@@ -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