diff options
author | Richard van der Hoff <richard@matrix.org> | 2018-12-20 15:15:36 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2018-12-20 15:15:36 +0000 |
commit | fba5afbcd406695f1b039c86f2b0174ce5bf1ce9 (patch) | |
tree | 235fba045bb7f636ed48fd72ba541166ab13c6af /tests/unittest.py | |
parent | da91dde24c0eb0fc5c596cb1135c1d8574f8e8c3 (diff) |
New upstream version 0.34.0
Diffstat (limited to 'tests/unittest.py')
-rw-r--r-- | tests/unittest.py | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index a9ce57da..092c9303 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -13,7 +13,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - +import gc import hashlib import hmac import logging @@ -31,10 +31,12 @@ from synapse.http.server import JsonResource from synapse.http.site import SynapseRequest from synapse.server import HomeServer from synapse.types import UserID, create_requester -from synapse.util.logcontext import LoggingContextFilter +from synapse.util.logcontext import LoggingContext, LoggingContextFilter from tests.server import get_clock, make_request, render, setup_test_homeserver -from tests.utils import default_config +from tests.utils import default_config, setupdb + +setupdb() # Set up putting Synapse's logs into Trial's. rootLogger = logging.getLogger() @@ -102,8 +104,16 @@ class TestCase(unittest.TestCase): # traceback when a unit test exits leaving things on the reactor. twisted.internet.base.DelayedCall.debug = True - old_level = logging.getLogger().level + # if we're not starting in the sentinel logcontext, then to be honest + # all future bets are off. + if LoggingContext.current_context() is not LoggingContext.sentinel: + self.fail( + "Test starting with non-sentinel logging context %s" % ( + LoggingContext.current_context(), + ) + ) + old_level = logging.getLogger().level if old_level != level: @around(self) @@ -115,6 +125,16 @@ class TestCase(unittest.TestCase): logging.getLogger().setLevel(level) return orig() + @around(self) + def tearDown(orig): + ret = orig() + # force a GC to workaround problems with deferreds leaking logcontexts when + # they are GCed (see the logcontext docs) + gc.collect() + LoggingContext.set_current_context(LoggingContext.sentinel) + + return ret + def assertObjectHasAttributes(self, attrs, obj): """Asserts that the given object has each of the attributes given, and that the value of each matches according to assertEquals.""" |