diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-11 10:33:19 +0000 |
| commit | fb233dc40b3111e905e394e627b8ecc3b2a91e80 (patch) | |
| tree | 931ab474f042b5eb5df9663306a4936406dcf17c /tests/unittest.py | |
| parent | PEP8 (diff) | |
| parent | Merge branch 'master' of github.com:matrix-org/synapse into develop (diff) | |
| download | synapse-fb233dc40b3111e905e394e627b8ecc3b2a91e80.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests
Diffstat (limited to 'tests/unittest.py')
| -rw-r--r-- | tests/unittest.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/unittest.py b/tests/unittest.py index a9c0e05541..fe26b7574f 100644 --- a/tests/unittest.py +++ b/tests/unittest.py @@ -69,6 +69,8 @@ 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): |