Package: terminado
Version: 0.18.0-1
Severity: normal
Tags: patch ftbfs
X-Debbugs-Cc: chris.peter...@canonical.com
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oracular ubuntu-patch
*** /tmp/tmpy5r27gh0/bug_body
In Ubuntu, the attached patch was applied to achieve the following:
Fix two bugs I encountered:
1. The d/t/control is missing the declaration for python3-pytest-timeout
which causes the autopkgtests to fail.
2. New errors types in Pytest 8.2 further caused the package to fail
autopkgtests.
* Update tests for pytest 8.2 compatibility (LP: #2068055).
- d/t/control: insert previously undeclared dependency on
python3-pytest-timeout
- d/p/unclosed-websockets.patch: apply test fixes from upstream
Thanks for considering the patch.
-- System Information:
Debian Release: trixie/sid
APT prefers oracular
APT policy: (500, 'oracular'), (100, 'oracular-proposed')
Architecture: amd64 (x86_64)
Kernel: Linux 6.8.0-31-generic (SMP w/16 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
diff -Nru terminado-0.18.0/debian/patches/series
terminado-0.18.0/debian/patches/series
--- terminado-0.18.0/debian/patches/series 1969-12-31 16:00:00.000000000
-0800
+++ terminado-0.18.0/debian/patches/series 2024-06-04 13:21:33.000000000
-0700
@@ -0,0 +1 @@
+unclosed-websockets.patch
diff -Nru terminado-0.18.0/debian/patches/unclosed-websockets.patch
terminado-0.18.0/debian/patches/unclosed-websockets.patch
--- terminado-0.18.0/debian/patches/unclosed-websockets.patch 1969-12-31
16:00:00.000000000 -0800
+++ terminado-0.18.0/debian/patches/unclosed-websockets.patch 2024-06-04
13:45:24.000000000 -0700
@@ -0,0 +1,54 @@
+Description: Close unclosed websockets in tests
+ Closes unclosed websockets in pytests to avoid Pytest
+ UnraisableExceptionWarning errors. This patch has been applied upstream
+ and can be dropped in 0.18.1
+Author: Chris Peterson <chris.peter...@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/terminado/+bug/2068055
+Forwarded: not-needed
+Applied-Upstream:
https://github.com/jupyter/terminado/commit/e2c1b0830b5f5994bdfeb4d2c2d3e51e114e40b9#diff-e6bcf9c8a7eb9d493e604bcae41818b790764d53e4d1ad3b0a1763004f94067a
+Last-Update: 2024-06-04
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/basic_test.py
++++ b/tests/basic_test.py
+@@ -248,6 +248,7 @@
+ assert killed
+ assert not terminal.ptyproc.isalive()
+ assert terminal.ptyproc.closed
++ [tm.close() for tm in tms]
+
+ @tornado.testing.gen_test
+ @pytest.mark.skipif("linux" not in platform, reason="It only works on
Linux")
+@@ -260,6 +261,8 @@
+ tm = await self.get_term_client(urls[MAX_TERMS])
+ msg = await tm.read_msg()
+ self.assertEqual(msg, None) # Connection closed
++ tm.close()
++ [tm.close() for tm in tms]
+
+
+ class SingleTermTests(TermTestCase):
+@@ -273,6 +276,7 @@
+ killed = await self.single_tm.terminal.terminate(True)
+ assert killed
+ assert self.single_tm.terminal.ptyproc.closed
++ [tm.close() for tm in tms]
+
+
+ class UniqueTermTests(TermTestCase):
+@@ -281,6 +285,7 @@
+ tms = await self.get_term_clients(["/unique", "/unique"])
+ pids = await self.get_pids(tms)
+ self.assertNotEqual(pids[0], pids[1])
++ [tm.close() for tm in tms]
+
+ @tornado.testing.gen_test
+ @pytest.mark.skipif("linux" not in platform, reason="It only works on
Linux")
+@@ -303,6 +308,7 @@
+ tm = await self.get_term_client("/unique")
+ msg = await tm.read_msg()
+ self.assertEqual(msg[0], "setup")
++ tm.close()
+
+ @tornado.testing.gen_test
+ @pytest.mark.timeout(timeout=ASYNC_TEST_TIMEOUT, method="thread")
diff -Nru terminado-0.18.0/debian/tests/control
terminado-0.18.0/debian/tests/control
--- terminado-0.18.0/debian/tests/control 2023-12-13 23:24:38.000000000
-0800
+++ terminado-0.18.0/debian/tests/control 2024-06-04 13:18:47.000000000
-0700
@@ -1,2 +1,2 @@
Tests: runtestsuite3
-Depends: python3-pytest, python3-terminado
+Depends: python3-pytest, python3-terminado, python3-pytest-timeout
