diff options
| author | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-07-29 11:24:56 +0100 |
| commit | 5aa024e50132924d50229c633249a17eff9180f1 (patch) | |
| tree | 5b0ee152c49f6a772bcb4e133fd4649aa612bda3 /tests/unittest.py | |
| parent | Add destination retry to slave store (diff) | |
| parent | Merge pull request #966 from matrix-org/markjh/fix_push (diff) | |
| download | synapse-5aa024e50132924d50229c633249a17eff9180f1.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/fed_reader
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index 5b22abfe74..38715972dd 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -17,13 +17,18 @@ from twisted.trial import unittest import logging - # logging doesn't have a "don't log anything at all EVARRRR setting, # but since the highest value is 50, 1000000 should do ;) 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("synapse.storage.SQL").setLevel(NEVER) +logging.getLogger("synapse.storage.txn").setLevel(NEVER) def around(target): @@ -70,8 +75,6 @@ class TestCase(unittest.TestCase): return ret logging.getLogger().setLevel(level) - # Don't set SQL logging - logging.getLogger("synapse.storage").setLevel(old_level) return orig() def assertObjectHasAttributes(self, attrs, obj): |