user debian-rele...@lists.debian.org
usertags 984493 + bsp-2021-04-AT-Salzburg
tags 984493 +pending
thank you

Dear maintainer,

I've prepared an NMU for twisted (versioned as 20.3.0-4.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.

Regards.

diff -Nru twisted-20.3.0/debian/changelog twisted-20.3.0/debian/changelog
--- twisted-20.3.0/debian/changelog	2021-02-13 08:12:02.000000000 +0100
+++ twisted-20.3.0/debian/changelog	2021-04-24 15:05:29.000000000 +0200
@@ -1,3 +1,11 @@
+twisted (20.3.0-4.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix "twisted fails autopkg tests" by disabling the offending test,
+    following upstreams here. (Closes: #984493)
+
+ -- Tobias Frost <t...@debian.org>  Sat, 24 Apr 2021 15:05:29 +0200
+
 twisted (20.3.0-4) unstable; urgency=medium
 
   * Team upload.
diff -Nru twisted-20.3.0/debian/patches/0025-fix-autopkgtest-984493.patch twisted-20.3.0/debian/patches/0025-fix-autopkgtest-984493.patch
--- twisted-20.3.0/debian/patches/0025-fix-autopkgtest-984493.patch	1970-01-01 01:00:00.000000000 +0100
+++ twisted-20.3.0/debian/patches/0025-fix-autopkgtest-984493.patch	2021-04-24 15:05:29.000000000 +0200
@@ -0,0 +1,58 @@
+Description: Disable broken test in QueryArgumentsTests (like upstream does)
+ The stdlib parse_qs has changed behaviour with regard to splitting query
+ parameters on ;
+ The vanilla upstream fix is not working for Debian, as ther unittest
+ framework does not have (yet) ifSkip, so we just remove the complete test for
+ now.  The Bug below is the underlaying problem, the Applied-Upstream PR is
+ disabling the test as well.
+Bug: https://twistedmatrix.com/trac/ticket/10096
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984493
+Forwarded: not-needed
+Applied-Upstream:  https://github.com/twisted/twisted/pull/1523
+Last-Update: 2021-04-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/twisted/web/test/test_http.py
++++ b/src/twisted/web/test/test_http.py
+@@ -10,6 +10,7 @@
+ import base64
+ import calendar
+ import random
++import sys
+ 
+ import hamcrest
+ 
+@@ -2340,18 +2341,21 @@
+ 
+ 
+ class QueryArgumentsTests(unittest.TestCase):
+-    def testParseqs(self):
+-        self.assertEqual(
+-            parse_qs(b"a=b&d=c;+=f"),
+-            http.parse_qs(b"a=b&d=c;+=f"))
+-        self.assertRaises(
+-            ValueError, http.parse_qs, b"blah", strict_parsing=True)
+-        self.assertEqual(
+-            parse_qs(b"a=&b=c", keep_blank_values=1),
+-            http.parse_qs(b"a=&b=c", keep_blank_values=1))
+-        self.assertEqual(
+-            parse_qs(b"a=&b=c"),
+-            http.parse_qs(b"a=&b=c"))
++    # FIXME: https://twistedmatrix.com/trac/ticket/10096
++    # Re-enable once the implementation is updated.
++    #@skipIf(sys.version_info >= (3, 6), "newer py3.6 parse_qs treat ; differently")
++    #def testParseqs(self):
++    #    self.assertEqual(
++    #        parse_qs(b"a=b&d=c;+=f"),
++    #        http.parse_qs(b"a=b&d=c;+=f"))
++    #    self.assertRaises(
++    #        ValueError, http.parse_qs, b"blah", strict_parsing=True)
++    #    self.assertEqual(
++    #        parse_qs(b"a=&b=c", keep_blank_values=1),
++    #        http.parse_qs(b"a=&b=c", keep_blank_values=1))
++    #    self.assertEqual(
++    #        parse_qs(b"a=&b=c"),
++    #        http.parse_qs(b"a=&b=c"))
+ 
+ 
+     def test_urlparse(self):
diff -Nru twisted-20.3.0/debian/patches/series twisted-20.3.0/debian/patches/series
--- twisted-20.3.0/debian/patches/series	2021-02-13 08:12:02.000000000 +0100
+++ twisted-20.3.0/debian/patches/series	2021-04-24 15:05:29.000000000 +0200
@@ -20,3 +20,4 @@
 0020-increase-size-of-FFDH-keys-for-conch-testing.patch
 0021-Merge-9801-rodrigc-cgi-Change-import-of-cgi.parse_qs.patch
 0022-fixed-corrupted-iqmp-value-in-test-RSA-key.patch
+0025-fix-autopkgtest-984493.patch

Attachment: signature.asc
Description: PGP signature

Reply via email to