summary refs log tree commit diff
path: root/tests/storage/test_client_ips.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/storage/test_client_ips.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/storage/test_client_ips.py')
-rw-r--r--tests/storage/test_client_ips.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/storage/test_client_ips.py b/tests/storage/test_client_ips.py

index 755c70db31..e96ca1c8ca 100644 --- a/tests/storage/test_client_ips.py +++ b/tests/storage/test_client_ips.py
@@ -412,7 +412,7 @@ class ClientIpAuthTestCase(unittest.HomeserverTestCase): "GET", "/_matrix/client/r0/admin/users/" + self.user_id, access_token=access_token, - **make_request_args + **make_request_args, ) request.requestHeaders.addRawHeader(b"User-Agent", b"Mozzila pizza")