[apache2] 04/04: Tweaks to fix the remaining test-framework tests

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit 030e3584d04a3f137ba6c8546e33ec8f1a6e573a
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon Aug 7 02:55:44 2017 +0200

    Tweaks to fix the remaining test-framework tests
---
 debian/changelog            | 2 ++
 debian/tests/control        | 2 +-
 debian/tests/run-test-suite | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ade2faf..539f270 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ apache2 (2.4.27-4) UNRELEASED; urgency=medium
     - change package priorities from extra to optional
   * Use libprotocol-http2-perl in autopkgtest.
   * Update test suite to svn r1804214.
+  * Various tweaks to the test suite autopkgtest to avoid having to skip
+    any test.
   * Also remove -DBUILD_DATETIME and -fdebug-prefix-map from config_vars.mk
     to avoid them being used by apxs.
 
diff --git a/debian/tests/control b/debian/tests/control
index d9e3430..fb913b5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,6 +1,6 @@
 Tests: run-test-suite
 Features: no-build-needed
-Restrictions: allow-stderr isolation-container
+Restrictions: allow-stderr isolation-container breaks-testbed needs-root
 Depends: build-essential, apache2, apache2-dev,
          libwww-perl, libnet-ssleay-perl, libanyevent-perl, libdatetime-perl,
          libhtml-parser-perl, libtime-hires-perl, libcrypt-ssleay-perl,
diff --git a/debian/tests/run-test-suite b/debian/tests/run-test-suite
index 0cf2c75..f845f5a 100644
--- a/debian/tests/run-test-suite
+++ b/debian/tests/run-test-suite
@@ -7,13 +7,13 @@ export PATH=/usr/lib/ccache:$PATH
 # set to "-v t/modules/ext_filter.t ..." to run only a few test, but verbose
 TESTS=""
 
+# The test framework assumes localhost resolves exclusively to 127.0.0.1
+# (and not to ::1). So remove 'localhost' from the ::1 entry.
+perl -p -i -e ' if (/^\s*::1\s+/) { s/\s+localhost\s+/ /g }' /etc/hosts
+
 cp -a debian/perl-framework $AUTOPKGTEST_TMP
 cd $AUTOPKGTEST_TMP/perl-framework
 
-# XXX TODO these tests have problems and need debugging
-rm t/protocol/echo.t
-rm t/security/CVE-2009-3555.t
-
 run_tests () {
 	local MPM=$1
 	shift

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git