summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-01-21 13:17:07 +0000
committerRichard van der Hoff <richard@matrix.org>2021-01-21 13:17:07 +0000
commitb5120f09f14bd42a705b89ef793c427178decd85 (patch)
tree7a3e55fdc2fd8dd1328179ab554be8985680c96b /tests
parentUse execute_batch instead of executemany in places (#9181) (diff)
parentPrefix idp_id with "oidc-" (#9189) (diff)
downloadsynapse-b5120f09f14bd42a705b89ef793c427178decd85.tar.xz
Merge remote-tracking branch 'origin/release-v1.26.0' into develop
Diffstat (limited to 'tests')
-rw-r--r--tests/rest/client/v1/test_login.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/rest/client/v1/test_login.py b/tests/rest/client/v1/test_login.py

index 2d25490374..2672ce24c6 100644 --- a/tests/rest/client/v1/test_login.py +++ b/tests/rest/client/v1/test_login.py
@@ -446,7 +446,7 @@ class MultiSSOTestCase(unittest.HomeserverTestCase): p.feed(channel.result["body"].decode("utf-8")) p.close() - self.assertCountEqual(p.radios["idp"], ["cas", "oidc", "idp1", "saml"]) + self.assertCountEqual(p.radios["idp"], ["cas", "oidc", "oidc-idp1", "saml"]) self.assertEqual(p.hiddens["redirectUrl"], TEST_CLIENT_REDIRECT_URL)