From 58e7bbc8ecad8016cc18f7dbd31b235cb515b785 Mon Sep 17 00:00:00 2001
From: Ofir Ovadia
Date: Wed, 4 Feb 2015 16:08:41 +0200
Subject: Prefetching the user object when getting the token in
 TokenAuthentication.

Since the user object is fetched 4 lines after getting Token from the database, this removes a DB query for each token-authenticated request.
---
 tests/test_authentication.py | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'tests/test_authentication.py')

diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index 44837c4e..caabcc21 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -202,6 +202,12 @@ class TokenAuthTests(TestCase):
         response = self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
 
+    def test_post_json_makes_one_db_query(self):
+        """Ensure that authenticating a user using a token performs only one DB query"""
+        auth = "Token " + self.key
+        func_to_test = lambda: self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth)
+        self.assertNumQueries(1, func_to_test)
+
     def test_post_form_failing_token_auth(self):
         """Ensure POSTing form over token auth without correct credentials fails"""
         response = self.csrf_client.post('/token/', {'example': 'example'})
-- 
cgit v1.2.3


From b2939c157d32e604e10099be891e382d8c54bbec Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 9 Feb 2015 17:43:20 +0000
Subject: Fixes for latest version of pep8

---
 tests/test_authentication.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tests/test_authentication.py')

diff --git a/tests/test_authentication.py b/tests/test_authentication.py
index caabcc21..19fe6043 100644
--- a/tests/test_authentication.py
+++ b/tests/test_authentication.py
@@ -205,7 +205,10 @@ class TokenAuthTests(TestCase):
     def test_post_json_makes_one_db_query(self):
         """Ensure that authenticating a user using a token performs only one DB query"""
         auth = "Token " + self.key
-        func_to_test = lambda: self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth)
+
+        def func_to_test():
+            return self.csrf_client.post('/token/', {'example': 'example'}, format='json', HTTP_AUTHORIZATION=auth)
+
         self.assertNumQueries(1, func_to_test)
 
     def test_post_form_failing_token_auth(self):
-- 
cgit v1.2.3