aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/tests/test-server-client14
2 files changed, 12 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 3943ed9..a7df8b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ sitesummary (0.1.25+nmu1) UNRELEASED; urgency=medium
* Adjust parser for collected information to handle the new ifconfig
output format (Closes: #832342).
+ * Adjusted autopkgtest script, prefer service over systemctl when
+ restarting apache2.
-- Petter Reinholdtsen <pere@debian.org> Sat, 26 Nov 2016 17:31:59 +0100
diff --git a/debian/tests/test-server-client b/debian/tests/test-server-client
index d796d43..347d2fb 100644
--- a/debian/tests/test-server-client
+++ b/debian/tests/test-server-client
@@ -14,10 +14,16 @@ trap at_exit INT TERM EXIT
LC_ALL=C
export LC_ALL
-# Installing the binaries should set up apache on localhost and the cgi script
-# for the sitesummary collector.
-
-systemctl restart apache2
+# Installing the binary packages should set up apache on localhost and
+# the cgi script for the sitesummary collector. But some times the
+# install does not do this, because the apt system is sorting the
+# postinst invocations so that sitesummary is set up before apache2,
+# causing the CGI script to not work. The reason is that sitesummary
+# only recommend apache2, and postinst ordering only take dependencies
+# into account. A fix using triggers to run what used to run in the
+# sitesummary postinst is implemented, and to be sure this take effect
+# for apache we restart apache here.
+service apache2 restart
sitesummary-client