Slightly saner logging for unittests
1. Give the handler used for logging in unit tests a formatter, so that the output is slightly more meaningful 2. Log some synapse.storage stuff, because it's useful.pull/947/head
parent
68a92afcff
commit
f16f0e169d
|
@ -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):
|
||||||
|
|
Loading…
Reference in New Issue