summary refs log tree commit diff
path: root/tests/test_federation.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-21 10:26:43 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-21 10:26:43 +0100
commita468d19fd6f24aafc4d5771b82558d59afb90f32 (patch)
tree4d9ac0d47224422c3f5458d3efea62be8ec997ad /tests/test_federation.py
parentimprove efficiency of _glob_to_re (diff)
parentStop BackgroundProcessLoggingContext making new prometheus timeseries (#9854) (diff)
downloadsynapse-a468d19fd6f24aafc4d5771b82558d59afb90f32.tar.xz
Merge branch 'release-v1.32.1' into matrix-org-hotfixes
Diffstat (limited to 'tests/test_federation.py')
-rw-r--r--tests/test_federation.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/test_federation.py b/tests/test_federation.py

index 0a3a996ec1..0ed8326f55 100644 --- a/tests/test_federation.py +++ b/tests/test_federation.py
@@ -135,7 +135,7 @@ class MessageAcceptTests(unittest.HomeserverTestCase): } ) - with LoggingContext(): + with LoggingContext("test-context"): failure = self.get_failure( self.handler.on_receive_pdu( "test.serv", lying_event, sent_to_us_directly=True