diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2022-05-04 14:11:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-04 14:11:21 -0400 |
| commit | 7fbf42499d92ec3c9a05d9f36ec5fecd1ab1f18c (patch) | |
| tree | 5f3a08745f204376a211aa3ece6f92f4108a9891 /tests/handlers | |
| parent | Implement changes to MSC2285 (hidden read receipts) (#12168) (diff) | |
| download | synapse-7fbf42499d92ec3c9a05d9f36ec5fecd1ab1f18c.tar.xz | |
Use `getClientAddress` instead of `getClientIP`. (#12599)
getClientIP was deprecated in Twisted 18.4.0, which also added getClientAddress. The Synapse minimum version for Twisted is currently 18.9.0, so all supported versions have the new API.
Diffstat (limited to 'tests/handlers')
| -rw-r--r-- | tests/handlers/test_cas.py | 2 | ||||
| -rw-r--r-- | tests/handlers/test_oidc.py | 4 | ||||
| -rw-r--r-- | tests/handlers/test_saml.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tests/handlers/test_cas.py b/tests/handlers/test_cas.py index 751025c5da..2b21547d0f 100644 --- a/tests/handlers/test_cas.py +++ b/tests/handlers/test_cas.py @@ -204,7 +204,7 @@ def _mock_request(): mock = Mock( spec=[ "finish", - "getClientIP", + "getClientAddress", "getHeader", "setHeader", "setResponseCode", diff --git a/tests/handlers/test_oidc.py b/tests/handlers/test_oidc.py index 9684120c70..1231aed944 100644 --- a/tests/handlers/test_oidc.py +++ b/tests/handlers/test_oidc.py @@ -1300,7 +1300,7 @@ def _build_callback_request( "getCookie", "cookies", "requestHeaders", - "getClientIP", + "getClientAddress", "getHeader", ] ) @@ -1310,5 +1310,5 @@ def _build_callback_request( request.args = {} request.args[b"code"] = [code.encode("utf-8")] request.args[b"state"] = [state.encode("utf-8")] - request.getClientIP.return_value = ip_address + request.getClientAddress.return_value.host = ip_address return request diff --git a/tests/handlers/test_saml.py b/tests/handlers/test_saml.py index e2f0f90ef1..a0f84e2940 100644 --- a/tests/handlers/test_saml.py +++ b/tests/handlers/test_saml.py @@ -352,7 +352,7 @@ def _mock_request(): mock = Mock( spec=[ "finish", - "getClientIP", + "getClientAddress", "getHeader", "setHeader", "setResponseCode", |