summaryrefslogtreecommitdiff
path: root/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch')
-rw-r--r--dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
new file mode 100644
index 000000000000..bbf943be60d1
--- /dev/null
+++ b/dev-python/testtools/files/testtools-2.7.2-twisted-fix.patch
@@ -0,0 +1,45 @@
+From 5b8cb6497c7159f593e68de6a13e15f7e78e56e3 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz>
+Date: Mon, 1 Jul 2024 10:00:05 +0200
+Subject: [PATCH] Prepare tests for upcoming twisted version
+
+Twisted recently changed behavior of logger on failures [1]. It newly
+logs the `Main loop terminated.` even on exceptions, which breaks two
+test in twistedsupport test suite. This hack attempts to address the
+upcoming issue.
+
+[1] https://github.com/twisted/twisted/pull/12207
+
+Upstream-PR: https://github.com/testing-cabal/testtools/pull/387
+
+diff --git a/testtools/tests/twistedsupport/test_runtest.py b/testtools/tests/twistedsupport/test_runtest.py
+index 4b46cc64..f8faf7c6 100644
+--- a/testtools/tests/twistedsupport/test_runtest.py
++++ b/testtools/tests/twistedsupport/test_runtest.py
+@@ -16,7 +16,6 @@
+ Contains,
+ ContainsAll,
+ ContainsDict,
+- EndsWith,
+ Equals,
+ Is,
+ KeysEqual,
+@@ -749,7 +748,7 @@ def test_something(self):
+ test,
+ {
+ "traceback": Not(Is(None)),
+- "twisted-log": AsText(EndsWith(" foo\n")),
++ "twisted-log": AsText(Contains(" foo\n")),
+ },
+ ),
+ ("stopTest", test),
+@@ -790,7 +789,8 @@ def test_something(self):
+ result = self.make_result()
+ runner.run(result)
+ self.assertThat(
+- messages, MatchesListwise([ContainsDict({"message": Equals(("foo",))})])
++ messages[0:1],
++ MatchesListwise([ContainsDict({"message": Equals(("foo",))})]),
+ )
+
+ def test_restore_observers(self):