Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #947 from matrix-org/rav/unittest_logging 

Slightly saner logging for unittests
This commit is contained in:
Richard van der Hoff 2016-07-25 13:44:46 +01:00 committed by GitHub
parent 68a92afcff f16f0e169d
commit e73ad8de3b
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unittest.py
View File

@ -17,13 +17,18 @@ from twisted.trial import unittest
import logging import logging
# logging doesn't have a "don't log anything at all EVARRRR setting, # logging doesn't have a "don't log anything at all EVARRRR setting,
# but since the highest value is 50, 1000000 should do ;) # but since the highest value is 50, 1000000 should do ;)
NEVER = 1000000 NEVER = 1000000
logging.getLogger().addHandler(logging.StreamHandler()) handler = logging.StreamHandler()
handler.setFormatter(logging.Formatter(
"%(levelname)s:%(name)s:%(message)s [%(pathname)s:%(lineno)d]"
))
logging.getLogger().addHandler(handler)
logging.getLogger().setLevel(NEVER) logging.getLogger().setLevel(NEVER)
logging.getLogger("synapse.storage.SQL").setLevel(NEVER)
logging.getLogger("synapse.storage.txn").setLevel(NEVER)
def around(target): def around(target):
@ -70,8 +75,6 @@ class TestCase(unittest.TestCase):
return ret return ret
logging.getLogger().setLevel(level) logging.getLogger().setLevel(level)
# Don't set SQL logging
logging.getLogger("synapse.storage").setLevel(old_level)
return orig() return orig()
def assertObjectHasAttributes(self, attrs, obj): def assertObjectHasAttributes(self, attrs, obj):