paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 13:03:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

requirements: Drop direct dependency on mock.

Browse Source 
mock is just a backport of the standard library’s unittest.mock now.

The SAMLAuthBackendTest change is needed because
MagicMock.call_args.args wasn’t introduced until Python
3.8 (https://bugs.python.org/issue21269).

The PROVISION_VERSION bump is skipped because mock is still an
indirect dev requirement via moto.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg
2020-05-25 22:16:25 -07:00
committed by Tim Abbott
parent 7f1cafd108
commit 840cf4b885
92 changed files with 106 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
zerver/tests/test_auth_backends.py
View File

@@ -15,7 +15,7 @@ import responses
import ldap
import jwt
import mock
from unittest import mock
import re
import datetime
import time
@@ -1598,8 +1598,10 @@ class SAMLAuthBackendTest(SocialAuthBase):
result = self.client_post('/complete/saml/', post_params)
self.assertEqual(result.status_code, 302)
self.assertEqual('/login/', result.url)
self.assertIn("/complete/saml/: Can't figure out subdomain for this authentication request",
m.call_args.args[0])
m.assert_called_once_with(
"/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: %s",
{},
)
def test_social_auth_complete_wrong_issuing_idp(self) -> None:
relay_state = ujson.dumps(dict(
@@ -1619,8 +1621,9 @@ class SAMLAuthBackendTest(SocialAuthBase):
result = self.client_post('/complete/saml/', post_params)
self.assertEqual(result.status_code, 302)
self.assertEqual('/login/', result.url)
self.assertIn("/complete/saml/: No valid IdP as issuer of the SAMLResponse.",
m.call_args.args[0])
m.assert_called_once_with(
"/complete/saml/: No valid IdP as issuer of the SAMLResponse.",
)
def test_social_auth_complete_valid_get_idp_bad_samlresponse(self) -> None:
"""
@@ -1864,8 +1867,10 @@ class SAMLAuthBackendTest(SocialAuthBase):
self.assertEqual(result.status_code, 302)
self.assertEqual('/login/', result.url)
self.assertIn("/complete/saml/: Can't figure out subdomain for this authentication request",
m.call_args.args[0])
m.assert_called_once_with(
"/complete/saml/: Can't figure out subdomain for this authentication request. relayed_params: %s",
{},
)
class GitHubAuthBackendTest(SocialAuthBase):
__unittest_skip__ = False