summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2021-04-23 12:22:55 +0100
committerAndrew Morgan <andrew@amorgan.xyz>2021-04-23 12:22:55 +0100
commit5a514a3e1113ea176b51f6bd8d8177dca2c021f4 (patch)
tree9fa8d3e604cd390302b53e340d8bc642d3c6a2a7 /tests
parentMerge commit 'd80428513' into anoa/dinsic_release_1_31_0 (diff)
parent1.28.0rc1 (diff)
downloadsynapse-5a514a3e1113ea176b51f6bd8d8177dca2c021f4.tar.xz
Merge commit '1381cd05b' into anoa/dinsic_release_1_31_0
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v2_alpha/test_auth.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/v2_alpha/test_auth.py b/tests/rest/client/v2_alpha/test_auth.py

index 501f09203f..c26ad824f7 100644 --- a/tests/rest/client/v2_alpha/test_auth.py +++ b/tests/rest/client/v2_alpha/test_auth.py
@@ -343,7 +343,7 @@ class UIAuthTests(unittest.HomeserverTestCase): }, ) - @unittest.override_config({"ui_auth": {"session_timeout": 5 * 1000}}) + @unittest.override_config({"ui_auth": {"session_timeout": "5s"}}) def test_can_reuse_session(self): """ The session can be reused if configured.