Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2025-02-01 06:44:55 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean-up some broken/unused code in the test framework (#8514)

Browse Source
This commit is contained in:
Patrick Cloke 2020-10-09 14:19:29 -04:00 committed by GitHub
parent 9789b1fba5
commit d35a451399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 52 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8514.misc Normal file
View File

@ -0,0 +1 @@
Remove unused code from the test framework.

2
tests/server.py
View File

@ -367,8 +367,6 @@ def setup_test_homeserver(cleanup_func, *args, **kwargs):
""" """
server = _sth(cleanup_func, *args, **kwargs) server = _sth(cleanup_func, *args, **kwargs)
database = server.config.database.get_single_database()
# Make the thread pool synchronous. # Make the thread pool synchronous.
clock = server.get_clock() clock = server.get_clock()

16
tests/utils.py
View File

@ -192,7 +192,6 @@ class TestHomeServer(HomeServer):
def setup_test_homeserver( def setup_test_homeserver(
cleanup_func, cleanup_func,
name="test", name="test",
datastore=None,
config=None, config=None,
reactor=None, reactor=None,
homeserverToUse=TestHomeServer, homeserverToUse=TestHomeServer,
@ -249,7 +248,7 @@ def setup_test_homeserver(
# Create the database before we actually try and connect to it, based off # Create the database before we actually try and connect to it, based off
# the template database we generate in setupdb() # the template database we generate in setupdb()
if datastore is None and isinstance(db_engine, PostgresEngine): if isinstance(db_engine, PostgresEngine):
db_conn = db_engine.module.connect( db_conn = db_engine.module.connect(
database=POSTGRES_BASE_DB, database=POSTGRES_BASE_DB,
user=POSTGRES_USER, user=POSTGRES_USER,
@ -265,7 +264,6 @@ def setup_test_homeserver(
cur.close() cur.close()
db_conn.close() db_conn.close()
if datastore is None:
hs = homeserverToUse( hs = homeserverToUse(
name, name,
config=config, config=config,
@ -327,18 +325,6 @@ def setup_test_homeserver(
# Register the cleanup hook # Register the cleanup hook
cleanup_func(cleanup) cleanup_func(cleanup)
else:
hs = homeserverToUse(
name,
datastore=datastore,
config=config,
version_string="Synapse/tests",
tls_server_context_factory=Mock(),
tls_client_options_factory=Mock(),
reactor=reactor,
**kargs
)
# bcrypt is far too slow to be doing in unit tests # bcrypt is far too slow to be doing in unit tests
# Need to let the HS build an auth handler and then mess with it # Need to let the HS build an auth handler and then mess with it
# because AuthHandler's constructor requires the HS, so we can't make one # because AuthHandler's constructor requires the HS, so we can't make one