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/util | |
| 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/util')
| -rw-r--r-- | tests/util/caches/test_descriptors.py | 6 |
1 files changed, 2 insertions, 4 deletions
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( |