summaryrefslogtreecommitdiff
path: root/test/integration/framework
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-07 01:46:30 +0200
committerDavid Kalnischkies <david@kalnischkies.de>2014-10-07 02:26:58 +0200
commit4dbfe436c60880f2625e4d3a9d0127a83dd6276e (patch)
treec3c947def18cbb02c20aaed2b41336acc8fae7ed /test/integration/framework
parent5684f71fa0f6c1b765aa53e22ca3b024c578b9c9 (diff)
display errortext for all Err as well as Ign logs
consistently using Item::Failed in all specializec classes helps setting up some information bits otherwise unset, so some errors had an empty reason as an error. Ign is upgraded to display the error message we ignored to further help in understanding what happens.
Diffstat (limited to 'test/integration/framework')
-rw-r--r--test/integration/framework13
1 files changed, 9 insertions, 4 deletions
diff --git a/test/integration/framework b/test/integration/framework
index 688a1abf2..29e5fafe6 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -715,7 +715,7 @@ buildaptarchivefromincoming() {
aptftparchive -qq generate ftparchive.conf
cd - > /dev/null
msgdone "info"
- generatereleasefiles
+ generatereleasefiles "$@"
}
buildaptarchivefromfiles() {
@@ -830,14 +830,19 @@ setupflataptarchive() {
}
setupaptarchive() {
- buildaptarchive
+ local NOUPDATE=0
+ if [ "$1" = '--no-update' ]; then
+ NOUPDATE=1
+ shift
+ fi
+ buildaptarchive "$@"
if [ -e aptarchive/dists ]; then
setupdistsaptarchive
else
setupflataptarchive
fi
- signreleasefiles
- if [ "$1" != '--no-update' ]; then
+ signreleasefiles 'Joe Sixpack' "$@"
+ if [ "1" != "$NOUPDATE" ]; then
testsuccess aptget update -o Debug::pkgAcquire::Worker=true -o Debug::Acquire::gpgv=true
fi
}