diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-20 14:55:16 +0100 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2021-04-20 14:55:16 +0100 |
| commit | 6982db965164ec54a0f5f7cb39b778f6ed0a7306 (patch) | |
| tree | fdd66aaf3e4433b0e91b0a708edf280e02058178 /tests | |
| parent | Add presence federation stream (#9819) (diff) | |
| parent | Update v1.32.0 changelog. It's m.login.application_service, not plural (diff) | |
| download | synapse-6982db965164ec54a0f5f7cb39b778f6ed0a7306.tar.xz | |
Merge branch 'master' into develop
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/logging/test_terse_json.py | 6 | ||||
| -rw-r--r-- | tests/test_federation.py | 2 | ||||
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/logging/test_terse_json.py b/tests/logging/test_terse_json.py index 6cddb95c30..1160716929 100644 --- a/tests/logging/test_terse_json.py +++ b/tests/logging/test_terse_json.py @@ -137,7 +137,7 @@ class TerseJsonTestCase(LoggerCleanupMixin, TestCase): ] self.assertCountEqual(log.keys(), expected_log_keys) self.assertEqual(log["log"], "Hello there, wally!") - self.assertTrue(log["request"].startswith("name@")) + self.assertEqual(log["request"], "name") def test_with_request_context(self): """ @@ -164,7 +164,9 @@ class TerseJsonTestCase(LoggerCleanupMixin, TestCase): # Also set the requester to ensure the processing works. request.requester = "@foo:test" - with LoggingContext(parent_context=request.logcontext): + with LoggingContext( + request.get_request_id(), parent_context=request.logcontext + ): logger.info("Hello there, %s!", "wally") log = self.get_log_line() 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 diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index 40cd98e2d8..178ac8a68c 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -230,8 +230,7 @@ class DescriptorTestCase(unittest.TestCase): @defer.inlineCallbacks def do_lookup(): - with LoggingContext() as c1: - c1.name = "c1" + with LoggingContext("c1") as c1: r = yield obj.fn(1) self.assertEqual(current_context(), c1) return r @@ -273,8 +272,7 @@ class DescriptorTestCase(unittest.TestCase): @defer.inlineCallbacks def do_lookup(): - with LoggingContext() as c1: - c1.name = "c1" + with LoggingContext("c1") as c1: try: d = obj.fn(1) self.assertEqual( |