summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2015-11-19 16:00:33 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2015-11-19 17:13:56 +0100
commit87d6947d51717e8b0e975d913986161598a7259a (patch)
treeaa7dfd6a63cbfffd75ace2bafc00589449aa02e6 /test/integration/framework
parentbc7a59dded57338e9b5e523726b246dbdd4e0935 (diff)
tests: use quiet level 0 by default in tests
Git-Dch: Ignore
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 49525cbd0..7a56a9acd 100644
--- 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
}