Merge branch 'develop' of github.com:matrix-org/synapse into timeout-federation-requests

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):