diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2014-10-07 23:52:12 +0200 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2014-10-07 23:52:12 +0200 |
| commit | 0045df3fc7c3c1dba084682805b50203472d443f (patch) | |
| tree | 8fd76a39e624e5225dec2398bc4c5778b90cd772 | |
| parent | d6cf2345a35896448e19bfb294ffe66faab00f86 (diff) | |
do not show IP in output of testcases
On travis-ci connect.cc detects a rotation, triggering it store the IP
which is later appended to the error message, which is all nice and
great if we deal with a real server, but in the testcases it just
triggers failures as strings do not match.
Git-Dch: Ignore
| -rw-r--r-- | apt-pkg/acquire-method.cc | 5 | ||||
| -rw-r--r-- | test/integration/framework | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/apt-pkg/acquire-method.cc b/apt-pkg/acquire-method.cc index 82f2fb3ce..cbcbea247 100644 --- a/apt-pkg/acquire-method.cc +++ b/apt-pkg/acquire-method.cc @@ -102,7 +102,10 @@ void pkgAcqMethod::Fail(string Err,bool Transient) if (Queue != 0) { std::cout << "400 URI Failure\nURI: " << Queue->Uri << "\n" - << "Message: " << Err << " " << IP << "\n"; + << "Message: " << Err; + if (IP.empty() == false && _config->FindB("Acquire::Failure::ShowIP", true) == true) + std::cout << " " << IP; + std::cout << "\n"; Dequeue(); } else diff --git a/test/integration/framework b/test/integration/framework index ad3c33c28..75cec204c 100644 --- a/test/integration/framework +++ b/test/integration/framework @@ -235,6 +235,9 @@ setupenvironment() { echo 'quiet::NoStatistic "true";' >> aptconfig.conf # too distracting for users, but helpful to detect changes echo 'Acquire::Progress::Ignore::ShowErrorText "true";' >> aptconfig.conf + # in testcases, it can appear as if localhost has a rotation setup, + # hide this as we can't really deal with it properly + echo 'Acquire::Failure::ShowIP "false";' >> 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 |