summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorXavier Fernandez <xavier.fernandez@polyconseil.fr>2014-06-06 11:19:16 +0200
committerTim Graham <timograham@gmail.com>2014-06-16 08:29:52 -0400
commit183e9d20294dec28df8ae5ea8ed7acc712adcd2b (patch)
tree7b98feb52f9b6c48fc1d27b9795e322943c66aa4 /django
parentd4305a15c1d48a0248ce1da1989a145009029e6c (diff)
[1.7.x] Fixed #22771 -- Fixed test.Client.logout when using custom auth backend.
Backport of 50b9313e0a from master
Diffstat (limited to 'django')
-rw-r--r--django/test/client.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/django/test/client.py b/django/test/client.py
index 9513dcd809..22c7b18b07 100644
--- a/django/test/client.py
+++ b/django/test/client.py
@@ -587,16 +587,13 @@ class Client(RequestFactory):
Causes the authenticated user to be logged out.
"""
- from django.contrib.auth import get_user_model, logout
+ from django.contrib.auth import get_user, logout
request = HttpRequest()
engine = import_module(settings.SESSION_ENGINE)
- UserModel = get_user_model()
if self.session:
request.session = self.session
- uid = self.session.get("_auth_user_id")
- if uid:
- request.user = UserModel._default_manager.get(pk=uid)
+ request.user = get_user(request)
else:
request.session = engine.SessionStore()
logout(request)