summary refs log tree commit diff
path: root/tests/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:57 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2020-12-31 13:40:57 +0000
commitb90b34744ab6292963f74509ecf4b4e553fc4085 (patch)
tree339e2c431c558f274ac25bcdd49c7009802259b9 /tests/server.py
parentMerge commit '88e1d0c52' into anoa/dinsic_release_1_23_1 (diff)
parentMerge pull request #8678 from matrix-org/rav/fix_frozen_events (diff)
downloadsynapse-b90b34744ab6292963f74509ecf4b4e553fc4085.tar.xz
Merge commit 'c97da1e45' into anoa/dinsic_release_1_23_1
Diffstat (limited to 'tests/server.py')
-rw-r--r--tests/server.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/server.py b/tests/server.py

index 4d33b84097..ea9c22bc51 100644 --- a/tests/server.py +++ b/tests/server.py
@@ -380,7 +380,7 @@ def setup_test_homeserver(cleanup_func, *args, **kwargs): pool._runWithConnection, func, *args, - **kwargs + **kwargs, ) def runInteraction(interaction, *args, **kwargs): @@ -390,7 +390,7 @@ def setup_test_homeserver(cleanup_func, *args, **kwargs): pool._runInteraction, interaction, *args, - **kwargs + **kwargs, ) pool.runWithConnection = runWithConnection