Source: pycurl
Version: 7.45.6-1
Severity: normal

Control: forwarded -1 https://github.com/pycurl/pycurl/issues/904

Dear Maintainer, hi.

We have uploaded curl 8.16.0-rc2 to unstable and pycurl's tests are
failing because they expect a specific string from curl's debug output
and it has changed in 8.16.0.

Attached you'll find a packaging patch to fix it containing a patch
already forwarded to upstream [2].

Cheers,
Charles

[1] https://ci.debian.net/packages/p/pycurl/testing/amd64/63846920/#L1299
[2] https://github.com/pycurl/pycurl/issues/904
>From 54179838324ca160694f4744cebd0d11ab4ce81a Mon Sep 17 00:00:00 2001
From: Carlos Henrique Lima Melara <[email protected]>
Date: Thu, 28 Aug 2025 23:34:58 -0300
Subject: [PATCH] Fix test failure against curl 8.16.0

---
 debian/changelog                              |  7 +++++
 debian/patches/series                         |  1 +
 ...hange-in-debug-output-in-curl-8.16.0.patch | 30 +++++++++++++++++++
 3 files changed, 38 insertions(+)
 create mode 100644 debian/patches/tests-handle-change-in-debug-output-in-curl-8.16.0.patch

diff --git a/debian/changelog b/debian/changelog
index d81b010..915fd31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pycurl (7.45.6-2) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * d/p/tests-handle-change-in-debug-output-in-curl-8.16.0.patch: add patch.
+
+ -- Carlos Henrique Lima Melara <[email protected]>  Thu, 28 Aug 2025 23:30:24 -0300
+
 pycurl (7.45.6-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/series b/debian/patches/series
index 41f2259..bc08f98 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-tests-Don-t-use-proxy-when-testing-connection-to-1.patch
 20_build_doc_for_debian.patch
 0004-Removed-privacy-breach-in-docs.patch
+tests-handle-change-in-debug-output-in-curl-8.16.0.patch
diff --git a/debian/patches/tests-handle-change-in-debug-output-in-curl-8.16.0.patch b/debian/patches/tests-handle-change-in-debug-output-in-curl-8.16.0.patch
new file mode 100644
index 0000000..b5ccfdc
--- /dev/null
+++ b/debian/patches/tests-handle-change-in-debug-output-in-curl-8.16.0.patch
@@ -0,0 +1,30 @@
+From: Carlos Henrique Lima Melara <[email protected]>
+Date: Thu, 28 Aug 2025 20:37:33 -0300
+Subject: tests: handle change in debug output in curl 8.16.0
+
+Debug message has changed and so the assert in the test is failing.
+Handle this by checking the version to pick the expected string to
+compare in the test.
+
+Forwarded: https://github.com/pycurl/pycurl/issues/904
+Last-Update: 2025-08-28
+---
+ tests/debug_test.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tests/debug_test.py b/tests/debug_test.py
+index 50da3d8..7c6372c 100644
+--- a/tests/debug_test.py
++++ b/tests/debug_test.py
+@@ -34,8 +34,10 @@ class DebugTest(unittest.TestCase):
+         self.check(0, util.b('Trying'))
+         if util.pycurl_version_less_than(7, 24):
+             self.check(0, util.b('connected'))
+-        else:
++        elif util.pycurl_version_less_than(8, 16):
+             self.check(0, util.b('Connected to %s' % localhost))
++        else:
++            self.check(0, util.b('Established connection to %s' % localhost))
+         self.check(0, util.b('port 8380'))
+         # request
+         self.check(2, util.b('GET /success HTTP/1.1'))
-- 
2.50.1

Reply via email to