From 4fba7258032c80d7f4c66594f886a2051d8851ef Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Sun, 2 Feb 2020 20:21:29 -0800 Subject: [PATCH] test_auth_backends: Fix errors after rebasing. Apparently, the rate-limiting PR had some import conflicts with our recent authentication backend testing changes. --- zerver/tests/test_auth_backends.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zerver/tests/test_auth_backends.py b/zerver/tests/test_auth_backends.py index 3e60d20b0f..a24beeecd0 100644 --- a/zerver/tests/test_auth_backends.py +++ b/zerver/tests/test_auth_backends.py @@ -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 (