Merge branch 'develop' of github.com:matrix-org/synapse into erikj/require_format_version

This commit is contained in:
Erik Johnston 2019-01-24 18:52:34 +00:00
commit efb8ed1d45
38 changed files with 509 additions and 698 deletions

View file

@ -49,6 +49,7 @@ class SQLBaseStoreTestCase(unittest.TestCase):
self.db_pool.runWithConnection = runWithConnection
config = Mock()
config._enable_native_upserts = False
config.event_cache_size = 1
config.database_config = {"name": "sqlite3"}
hs = TestHomeServer(