summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 17:37:43 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 17:37:43 +0000
commit7025781df8ab295848cb70a43d0ff8ca5949bc19 (patch)
tree14421f92093e915babba2bc51d00f5d48ebf9437 /tests
parentMerge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1 (diff)
parentMerge pull request #82 from matrix-org/git_tag_version (diff)
downloadsynapse-7025781df8ab295848cb70a43d0ff8ca5949bc19.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
Diffstat (limited to '')
-rw-r--r--tests/utils.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/tests/utils.py b/tests/utils.py

index 39895c739f..110b9f86b8 100644 --- a/tests/utils.py +++ b/tests/utils.py
@@ -46,10 +46,16 @@ def setup_test_homeserver(name="test", datastore=None, config=None, **kargs): if datastore is None: db_pool = SQLiteMemoryDbPool() yield db_pool.prepare() - hs = HomeServer(name, db_pool=db_pool, config=config, **kargs) + hs = HomeServer( + name, db_pool=db_pool, config=config, + version_string="Synapse/tests", + **kargs + ) else: hs = HomeServer( - name, db_pool=None, datastore=datastore, config=config, **kargs + name, db_pool=None, datastore=datastore, config=config, + version_string="Synapse/tests", + **kargs ) defer.returnValue(hs)