about summary refs log tree commit diff
path: root/test/python/test_group_trait_values.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/python/test_group_trait_values.py')
-rw-r--r--test/python/test_group_trait_values.py42
1 files changed, 20 insertions, 22 deletions
diff --git a/test/python/test_group_trait_values.py b/test/python/test_group_trait_values.py
index 7501757..5b97282 100644
--- a/test/python/test_group_trait_values.py
+++ b/test/python/test_group_trait_values.py
@@ -1,6 +1,7 @@
-"""Mirrors tests/group_trait_values.rs. Needs a live MariaDB (SQL_URI);
-skips with a message rather than failing when none is reachable, same as
-test_group_by_name.py.
+"""Mirrors tests/group_trait_values.rs. Needs a live MariaDB (SQL_URI)
+and a valid token (every endpoint needs one now -- see
+docs/gn-auth.md); skips with a message rather than failing when either
+is missing, same as test_group_by_name.py.
 """
 
 import http.client
@@ -8,6 +9,7 @@ import json
 import socket
 import unittest
 
+from auth_helpers import TOKEN_ENV, auth_token
 from server_test_case import HOST, PORT, ServerTestCase
 
 
@@ -20,17 +22,25 @@ def database_reachable():
 
 
 class GroupTraitValuesTest(ServerTestCase):
-    def test_group_trait_values_bxd_returns_strain_values(self):
-        if not database_reachable():
-            self.skipTest("no database on 127.0.0.1:3306")
+    EXTRA_ENV = TOKEN_ENV
 
+    def get(self, path):
+        token = auth_token()
+        if not token:
+            self.skipTest("no token (see docs/gn-auth.md)")
         conn = http.client.HTTPConnection(HOST, int(PORT), timeout=10)
         try:
-            conn.request("GET", "/groups/BXD/traits/10001/values")
+            conn.request("GET", path, headers={"Authorization": f"Bearer {token}"})
             response = conn.getresponse()
-            body = response.read()
+            return response, response.read()
         finally:
             conn.close()
+
+    def test_group_trait_values_bxd_returns_strain_values(self):
+        if not database_reachable():
+            self.skipTest("no database on 127.0.0.1:3306")
+
+        response, body = self.get("/groups/BXD/traits/10001/values")
         self.assertEqual(response.status, 200)
 
         values = json.loads(body)
@@ -42,13 +52,7 @@ class GroupTraitValuesTest(ServerTestCase):
         if not database_reachable():
             self.skipTest("no database on 127.0.0.1:3306")
 
-        conn = http.client.HTTPConnection(HOST, int(PORT), timeout=10)
-        try:
-            conn.request("GET", "/groups/not-a-real-group/traits/10001/values")
-            response = conn.getresponse()
-            body = response.read()
-        finally:
-            conn.close()
+        response, body = self.get("/groups/not-a-real-group/traits/10001/values")
         self.assertEqual(response.status, 404)
 
         error = json.loads(body)
@@ -61,13 +65,7 @@ class GroupTraitValuesTest(ServerTestCase):
         if not database_reachable():
             self.skipTest("no database on 127.0.0.1:3306")
 
-        conn = http.client.HTTPConnection(HOST, int(PORT), timeout=10)
-        try:
-            conn.request("GET", "/groups/BXD/traits/999999999/values")
-            response = conn.getresponse()
-            body = response.read()
-        finally:
-            conn.close()
+        response, body = self.get("/groups/BXD/traits/999999999/values")
         self.assertEqual(response.status, 404)
 
         error = json.loads(body)