diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-07 20:51:07 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-07 21:08:37 +0200 |
| commit | d6cf2345a35896448e19bfb294ffe66faab00f86 (patch) | |
| tree | 631414eab0509ec034e2b497732892ebafda492c /test | |
| parent | 4d0818cc39f7c0d44ecdfcdf9701058f81caa492 (diff) | |
don't show ErrorText for Ign by default
Some distributions (or repositories) do not have as much
"Ign-discipline" as I would like to, so that could be pretty distracting
for our users if enabled by default. It is handy for testcases though.
Git-Dch: Ignore
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/framework | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/integration/framework b/test/integration/framework index 0aa648fb6..ad3c33c28 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -215,6 +215,7 @@ setupenvironment() { cp $(find $TESTDIRECTORY -name '*.pub' -o -name '*.sec') keys/ chmod 644 $(find keys -name '*.pub' -o -name '*.sec') ln -s ${TMPWORKINGDIRECTORY}/keys/joesixpack.pub rootdir/etc/apt/trusted.gpg.d/joesixpack.gpg + echo "Dir \"${TMPWORKINGDIRECTORY}/rootdir\";" > aptconfig.conf echo "Dir::state::status \"${TMPWORKINGDIRECTORY}/rootdir/var/lib/dpkg/status\";" >> aptconfig.conf echo "Debug::NoLocking \"true\";" >> aptconfig.conf @@ -232,8 +233,11 @@ setupenvironment() { echo "DPKG::options:: \"--log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log\";" >> aptconfig.conf echo 'quiet::NoUpdate "true";' >> aptconfig.conf echo 'quiet::NoStatistic "true";' >> aptconfig.conf + # too distracting for users, but helpful to detect changes + echo 'Acquire::Progress::Ignore::ShowErrorText "true";' >> aptconfig.conf + echo "Acquire::https::CaInfo \"${TESTDIR}/apt.pem\";" > rootdir/etc/apt/apt.conf.d/99https - echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary + echo "Apt::Cmd::Disable-Script-Warning \"1\";" > rootdir/etc/apt/apt.conf.d/apt-binary configcompression '.' 'gz' #'bz2' 'lzma' 'xz' # cleanup the environment a bit |