Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

test_auth_backends: Fix errors after rebasing. 

Apparently, the rate-limiting PR had some import conflicts with our
recent authentication backend testing changes.
This commit is contained in:
Tim Abbott 2020-02-02 20:21:29 -08:00
parent 7858e5ee40
commit 4fba725803
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zerver/tests/test_auth_backends.py
View File

@ -17,6 +17,7 @@ import jwt
import mock
import re
import datetime
import time
from zerver.lib.actions import (
do_create_user,
@ -40,9 +41,8 @@ from zerver.lib.validator import validate_login_email, \
from zerver.lib.rate_limiter import add_ratelimit_rule, remove_ratelimit_rule, clear_history
from zerver.lib.request import JsonableError
from zerver.lib.storage import static_path
from zerver.lib.users import get_all_api_keys
from zerver.lib.utils import generate_random_token
from zerver.lib.upload import resize_avatar, MEDIUM_AVATAR_SIZE
from zerver.lib.users import get_all_api_keys
from zerver.lib.utils import generate_random_token
from zerver.lib.initial_password import initial_password
from zerver.lib.test_classes import (