diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-10-01 17:16:20 +0100 |
commit | 5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac (patch) | |
tree | 212df92ddefaf749db59c2e431d768184540de19 /tests/util/test_logcontext.py | |
parent | changelog (diff) | |
parent | Update instructions to point to pip install (#3985) (diff) | |
download | synapse-5908a8f6f5abd4fb08cf0c43e7ee51175d9bf7ac.tar.xz |
Merge branch 'develop' into rav/fix_missing_create_event_error
Diffstat (limited to 'tests/util/test_logcontext.py')
-rw-r--r-- | tests/util/test_logcontext.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/util/test_logcontext.py b/tests/util/test_logcontext.py index 4633db77b3..8adaee3c8d 100644 --- a/tests/util/test_logcontext.py +++ b/tests/util/test_logcontext.py @@ -159,6 +159,11 @@ class LoggingContextTestCase(unittest.TestCase): self.assertEqual(r, "bum") self._check_test_key("one") + def test_nested_logging_context(self): + with LoggingContext(request="foo"): + nested_context = logcontext.nested_logging_context(suffix="bar") + self.assertEqual(nested_context.request, "foo-bar") + # a function which returns a deferred which has been "called", but # which had a function which returned another incomplete deferred on |