File: 1434.patch

package info (click to toggle)
tahoe-lafs 1.20.0-8
  • links: PTS, VCS
  • area: main
  • in suites: forky, sid
  • size: 11,004 kB
  • sloc: python: 88,832; makefile: 382; sh: 104; lisp: 89; xml: 37
file content (43 lines) | stat: -rw-r--r-- 1,659 bytes parent folder | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
From 52b7b9df0a206307d377bb6a8d4fb2667f63d648 Mon Sep 17 00:00:00 2001
From: Florian Sesser <florian@leastauthority.com>
Date: Thu, 28 Aug 2025 15:53:08 +0000
Subject: [PATCH] Amend TestStreamingLogs to work with Twisted 25.5.0

Fixes [#4181](https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4181)
Refs [#4185](https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4185)
---
 newsfragments/4181.minor            | 0
 src/allmydata/test/web/test_logs.py | 5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)
 create mode 100644 newsfragments/4181.minor

diff --git a/newsfragments/4181.minor b/newsfragments/4181.minor
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/allmydata/test/web/test_logs.py b/src/allmydata/test/web/test_logs.py
index 34ecccff6..fe182be5f 100644
--- a/src/allmydata/test/web/test_logs.py
+++ b/src/allmydata/test/web/test_logs.py
@@ -8,8 +8,9 @@ import json
 
 from twisted.internet.defer import inlineCallbacks
 
+from twisted.internet.testing import MemoryReactorClock
 
-from autobahn.twisted.testing import create_memory_agent, MemoryReactorClockResolver, create_pumper
+from autobahn.twisted.testing import create_memory_agent, create_pumper
 
 from testtools.matchers import (
     Equals,
@@ -72,7 +73,7 @@ class TestStreamingLogs(AsyncTestCase):
 
     def setUp(self):
         super(TestStreamingLogs, self).setUp()
-        self.reactor = MemoryReactorClockResolver()
+        self.reactor = MemoryReactorClock()
         self.pumper = create_pumper()
         self.agent = create_memory_agent(self.reactor, self.pumper, TokenAuthenticatedWebSocketServerProtocol)
         return self.pumper.start()
-- 
2.51.0