Merge ~ahasenack/ubuntu/+source/squid3:xenial-squid-reload-1738412 into ubuntu/+source/squid3:ubuntu/xenial-devel

[Andreas Hasenack]

Fixes the regexp used to detect problems in the squid configuration file.

The (SRU) bug has test details, and regression considerations.

I also took the oportunity to fix the DEP8 tests for xenial. I have a bileto run, but can't get to the test logs there, so I uploaded the results here: http://people.ubuntu.com/~ahasenack/dep8-squid3-xenial/

Bileto ticket: https://bileto.ubuntu.com/#/ticket/3502

I debated adding a python-minimal dependency to d/t/control. I can still do that if preferred, it just seems unecessary.

[Christian Ehrhardt  (paelzer)]

The changes LGTM +1 for those.

I read and thought about the regression potential twice, but I like the "explicitly broken" much more than "silently broken". I think it is good that you outlined it in the bug, but I'd want the change and not see it as a bad thing.

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagged and uploaded.

diff --git a/debian/changelog b/debian/changelog
index b72010c..35a4a77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+squid3 (3.5.12-1ubuntu7.6) xenial; urgency=medium
+
+  * d/squid.rc: fix regexp for catching FATAL errors (LP: #1738412)
+  * d/t/test-squid.py: in xenial,  initscript, apparmor profile, pidfile and
+    process are named squid, not squid3. Get rid of the multiple distro
+    logic since these tests will be only run on xenial.
+  * d/t/control: drop uneeded dependency on python-unit.
+  * d/t/squid: use a shorter shutdown timeout for the tests, so they
+    run faster
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 31 Oct 2018 09:22:14 -0300
+
 squid3 (3.5.12-1ubuntu7.5) xenial-security; urgency=medium
 
   * SECURITY UPDATE: various denial of service issues
diff --git a/debian/squid.rc b/debian/squid.rc
index 204b676..67e6844 100644
--- a/debian/squid.rc
+++ b/debian/squid.rc
@@ -140,7 +140,7 @@ fi
 
 case "$1" in
     start)
-	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL .*"`
+	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL: .*"`
 	if test -n "$res";
 	then
 		log_failure_msg "$res"
@@ -163,7 +163,7 @@ case "$1" in
 	fi
 	;;
     reload|force-reload)
-	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL .*"`
+	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL: .*"`
 	if test -n "$res";
 	then
 		log_failure_msg "$res"
@@ -176,7 +176,7 @@ case "$1" in
 	fi
 	;;
     restart)
-	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL .*"`
+	res=`$DAEMON -k parse -f $CONFIG 2>&1 | grep -o "FATAL: .*"`
 	if test -n "$res";
 	then
 		log_failure_msg "$res"
diff --git a/debian/tests/control b/debian/tests/control
index 52efdc4..a97a14d 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: squid
-Depends: squid, squidclient, python-unit, elinks, netcat, pygopherd, apparmor-utils, vsftpd
+Depends: squid, squidclient, elinks, netcat, pygopherd, apparmor-utils, vsftpd
 Restrictions: needs-root
diff --git a/debian/tests/squid b/debian/tests/squid
index f17feef..4a76b4b 100755
--- a/debian/tests/squid
+++ b/debian/tests/squid
@@ -8,4 +8,9 @@ set -e
 sed -i "s/anonymous_enable[[:blank:]]*=[[:blank:]]*.*/anonymous_enable=YES/g" /etc/vsftpd.conf
 echo "seccomp_sandbox=NO" >> /etc/vsftpd.conf
 service vsftpd restart 2>&1 > /dev/null
+
+# use a shorter timeout so tests run faster
+if ! grep -qE "^shutdown_lifetime" /etc/squid/squid.conf; then
+    echo "shutdown_lifetime 2 seconds" >> /etc/squid/squid.conf
+fi
 python `dirname $0`/test-squid.py 2>&1
diff --git a/debian/tests/test-squid.py b/debian/tests/test-squid.py
index b6dbc45..f5487fb 100644
--- a/debian/tests/test-squid.py
+++ b/debian/tests/test-squid.py
@@ -94,15 +94,13 @@ class BasicTest(testlib_httpd.HttpdCommon, PrivateSquidTest):
         if self.lsb_release['Release'] == 10.10 and not os.path.exists("/etc/init.d/squid"):
             os.symlink("/lib/init/upstart-job", "/etc/init.d/squid")
 
-        self._set_initscript("/etc/init.d/squid")
-        if self.lsb_release['Release'] >= 12.04:
-            self._set_initscript("squid3")
+        self._set_initscript("squid")
 
         testlib_httpd.HttpdCommon._setUp(self)
 
         self.gophermap = "/var/gopher/gophermap"
 
-        self.aa_profile = "usr.sbin.squid3"
+        self.aa_profile = "usr.sbin.squid"
         self.aa_abs_profile = "/etc/apparmor.d/%s" % self.aa_profile
         self.version_with_apparmor = 12.10
         # This hack is only used until we have tests run both confined and
@@ -116,12 +114,8 @@ class BasicTest(testlib_httpd.HttpdCommon, PrivateSquidTest):
 
     def test_daemons(self):
         '''Test daemon'''
-        pidfile = "/run/squid3.pid"
-        exe = "squid3"
-
-        if self.lsb_release['Release'] < 12.04:
-            pidfile = "/var/run/squid.pid"
-            exe = "squid"
+        pidfile = "/run/squid.pid"
+        exe = "squid"
 
         self.assertTrue(testlib.check_pidfile(exe, pidfile))