Merge ~ahasenack/ubuntu/+source/squid:focal-squid-drop-gopherd-dep8 into ubuntu/+source/squid:ubuntu/devel

[Andreas Hasenack]

pygopherd was removed from focal, and I didn't find any other gopher server, so let's drop the gopher test.

While running that, I saw that we also need to update the python story of the dep8 test-squid.py test, and turns out it works with python3 with minimal changes (assertEquals -> assertEqual), so I did that here as well.

Tests pass, run with autopkgtest -o dep8 -U -s -B ./squid/ -- lxd ubuntu-daily:focal

$ tail dep8/log -n 20
Test ftp ... ok
test_http_proxy (__main__.BasicTest)
Test http ... ok
test_https_proxy (__main__.BasicTest)
Test https ... ok
test_squidclient (__main__.BasicTest)
Test squidclient ... ok
test_zz_apparmor (__main__.BasicTest)
Test apparmor ... ok

----------------------------------------------------------------------
Ran 6 tests in 271.278s

OK
autopkgtest [15:45:23]: test squid: -----------------------]
autopkgtest [15:45:23]: test squid: - - - - - - - - - - results - - - - - - - - - -
squid PASS
autopkgtest [15:45:23]: @@@@@@@@@@@@@@@@@@@@ summary
upstream-test-suite PASS
squid PASS

[Andreas Hasenack (ahasenack)]

It also passed when using --apt-pocket=proposed

[Andreas Hasenack (ahasenack)]

Sent to debian: https://salsa.debian.org/squid-team/squid/merge_requests/11

[Andreas Hasenack (ahasenack)]

(This fix will help unblock openldap in excuses)

[Lucas Kanashiro (lucaskanashiro)]

+1, LGTM and the Debian maintainer already merged it :)

review: Approve

[Andreas Hasenack (ahasenack)]

Thanks, tagging and uploading 5cf238b0a8e627a595ba0f4e6b88e889cc5217af

$ git push pkg upload/4.9-2ubuntu2
Enumerating objects: 29, done.
Counting objects: 100% (29/29), done.
Delta compression using up to 4 threads
Compressing objects: 100% (22/22), done.
Writing objects: 100% (22/22), 2.46 KiB | 66.00 KiB/s, done.
Total 22 (delta 14), reused 0 (delta 0)
remote: Checking connectivity: 22, done.
To ssh://git.launchpad.net/~usd-import-team/ubuntu/+source/squid
 * [new tag] upload/4.9-2ubuntu2 -> upload/4.9-2ubuntu2

$ dput ubuntu ../squid_4.9-2ubuntu2_source.changes
Checking signature on .changes
gpg: ../squid_4.9-2ubuntu2_source.changes: Valid signature from AC983EB5BF6BCBA9
Checking signature on .dsc
gpg: ../squid_4.9-2ubuntu2.dsc: Valid signature from AC983EB5BF6BCBA9
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading squid_4.9-2ubuntu2.dsc: done.
  Uploading squid_4.9-2ubuntu2.debian.tar.xz: done.
  Uploading squid_4.9-2ubuntu2_source.buildinfo: done.
  Uploading squid_4.9-2ubuntu2_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index 110ec72..0fc8039 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+squid (4.9-2ubuntu2) focal; urgency=medium
+
+  * d/t/control, d/t/test-squid.py: remove gopher tests, as pygopherd is
+    no longer available in Focal (LP: #1858827)
+  * d/t/test-squid.py, d/t/squid: switch to python3
+  * d/t/control: depend on python3-minimal
+
+ -- Andreas Hasenack <[e-mail]>  Wed, 08 Jan 2020 15:52:32 -0300
+
 squid (4.9-2ubuntu1) focal; urgency=medium
 
   * Merge with Debian unstable. Remaining changes:
diff --git a/debian/tests/control b/debian/tests/control
index c6bad41..51cd6f5 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,5 +3,5 @@ Depends: @builddeps@, fakeroot, squid
 Restrictions: allow-stderr
 
 Tests: squid
-Depends: squid, squidclient, elinks, netcat, pygopherd, apparmor-utils, vsftpd, apache2, ssl-cert
+Depends: squid, squidclient, elinks, netcat, apparmor-utils, vsftpd, apache2, ssl-cert, python3-minimal
 Restrictions: needs-root
diff --git a/debian/tests/squid b/debian/tests/squid
index 015177b..45d573e 100644
--- a/debian/tests/squid
+++ b/debian/tests/squid
@@ -31,4 +31,4 @@ service vsftpd restart 2>&1 > /dev/null
 a2enmod ssl
 a2ensite default-ssl
 systemctl restart apache2
-python `dirname $0`/test-squid.py 2>&1
+python3 `dirname $0`/test-squid.py 2>&1
diff --git a/debian/tests/test-squid.py b/debian/tests/test-squid.py
index e7a8044..53a5af9 100644
--- a/debian/tests/test-squid.py
+++ b/debian/tests/test-squid.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 #
 #    test-squid.py quality assurance test script
 #    Copyright (C) 2008-2017 Canonical Ltd.
@@ -58,7 +58,7 @@ class HttpdCommon(unittest.TestCase):
         expected = 0
         ret, report = cmd([self.initscript, 'start'])
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(expected, ret, result + report)
+        self.assertEqual(expected, ret, result + report)
         time.sleep(2)
 
     def _stop(self):
@@ -66,7 +66,7 @@ class HttpdCommon(unittest.TestCase):
         expected = 0
         ret, report = cmd([self.initscript, 'stop'])
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(expected, ret, result + report)
+        self.assertEqual(expected, ret, result + report)
 
     def _word_find(self, report, content, invert=False):
         '''Check for a specific string'''
@@ -90,7 +90,7 @@ class HttpdCommon(unittest.TestCase):
                         '-dump', url])
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(expected, ret, result + rep)
+        self.assertEqual(expected, ret, result + rep)
 
         if content != "":
             self._word_find(rep, content)
@@ -104,15 +104,12 @@ class BasicTest(HttpdCommon):
         self._set_initscript("/etc/init.d/squid")
         HttpdCommon._setUp(self)
 
-        self.gophermap = "/var/gopher/gophermap"
-
         self.aa_profile = "usr.sbin.squid"
         self.aa_abs_profile = "/etc/apparmor.d/%s" % self.aa_profile
 
     def tearDown(self):
         '''Shutdown methods'''
         HttpdCommon._tearDown(self)
-        config_restore(self.gophermap)
 
     def test_daemons(self):
         '''Test daemon'''
@@ -141,43 +138,13 @@ class BasicTest(HttpdCommon):
 
     def test_squidclient(self):
         '''Test squidclient'''
-        urls = ['ftp://anonymous@localhost:21', 'gopher://127.0.0.1']
-        for url in urls:
-            ret, report = cmd(['squidclient', '-h', '127.0.0.1', '-p',
-                               '3128', '-r', url])
-            expected = 0
-            result = 'Got exit code %d, expected %d\n' % (ret, expected)
-            self.assertEquals(expected, ret, result + report)
-
-    def test_CVE_2011_3205(self):
-        '''Test parsing lines > 4096 in length (CVE-2011-3205)'''
-
-        longline = "ABCDEF" * 4096
-
-        config_replace(self.gophermap,
-                       """Welcome to Pygopherd!  You can place your documents
-in /var/gopher for future use.  You can remove the gophermap
-file there to get rid of this message, or you can edit it to
-use other things.  (You'll need to do at least one of these
-two things in order to get your own data to show up!)
-
-%s
-
-Some links to get you started:
-
-1Pygopherd Home /devel/gopher/pygopherd gopher.quux.org 70
-1Quux.Org Mega Server   /   gopher.quux.org 70
-1The Gopher Project /Software/Gopher    gopher.quux.org 70
-1Traditional UMN Home Gopher    /   gopher.tc.umn.edu   70
-
-Welcome to the world of Gopher and enjoy!
-""" % (longline), append=False)
-
+        url = 'ftp://anonymous@localhost:21'
         ret, report = cmd(['squidclient', '-h', '127.0.0.1', '-p',
-                           '3128', '-r', "gopher://127.0.0.1"])
+                           '3128', '-r', url])
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(expected, ret, result + report)
+        self.assertEqual(expected, ret, result + report)
+
 
     # Run this last so if we enable the profile then we don't unload it
     def test_zz_apparmor(self):
@@ -188,13 +155,13 @@ Welcome to the world of Gopher and enjoy!
         ret, report = check_apparmor(self.aa_abs_profile, is_running=False)
         expected = 1
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(ret, expected, result + report)
+        self.assertEqual(ret, expected, result + report)
 
         # Verify it is syntactically correct
         ret, report = cmd(['apparmor_parser', '-p', self.aa_abs_profile])
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(ret, expected, result + report)
+        self.assertEqual(ret, expected, result + report)
 
         # The remaining tests try to actually load a profile
         # skip them if securityfs isn't mounted (i.e., we are in a lxc container)
@@ -208,7 +175,7 @@ Welcome to the world of Gopher and enjoy!
         ret, report = cmd(['aa-enforce', self.aa_abs_profile])
         expected = 0
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(ret, expected, result + report)
+        self.assertEqual(ret, expected, result + report)
 
         self._stop()
         self._start()
@@ -216,7 +183,7 @@ Welcome to the world of Gopher and enjoy!
         ret, report = check_apparmor(self.aa_abs_profile, is_running=True)
         expected = 1
         result = 'Got exit code %d, expected %d\n' % (ret, expected)
-        self.assertEquals(ret, expected, result + report)
+        self.assertEqual(ret, expected, result + report)
 
 
 # http://www.chiark.greenend.org.uk/ucgi/~cjwatson/blosxom/2009-07-02-python-sigpipe.html