about summary refs log tree commit diff
path: root/test/python/test_traits.py
diff options
context:
space:
mode:
Diffstat (limited to 'test/python/test_traits.py')
-rw-r--r--test/python/test_traits.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/python/test_traits.py b/test/python/test_traits.py
index 6a44bd8..850aa8a 100644
--- a/test/python/test_traits.py
+++ b/test/python/test_traits.py
@@ -12,7 +12,7 @@ import socket
 import unittest
 
 from auth_helpers import TOKEN_ENV, auth_server_reachable, auth_token
-from server_test_case import HOST, PORT, ServerTestCase
+from server_test_case import HOST, PORT, ServerTestCase, envelope_data
 
 
 def database_reachable():
@@ -50,7 +50,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/Br_U_0803_M/100001_at")
         self.assertEqual(response.status, 200)
 
-        info = json.loads(body)
+        info = envelope_data(body)
         self.assertEqual(info["category"], "probeset")
         self.assertEqual(info["name"], "100001_at")
         self.assertEqual(info["symbol"], "Cd3g")
@@ -61,7 +61,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/BXD/10001")
         self.assertEqual(response.status, 200)
 
-        info = json.loads(body)
+        info = envelope_data(body)
         self.assertEqual(info["category"], "publish")
         self.assertEqual(info["id"], 10001)
 
@@ -71,7 +71,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/BXDPublish/10001")
         self.assertEqual(response.status, 200)
 
-        info = json.loads(body)
+        info = envelope_data(body)
         self.assertEqual(info["category"], "publish")
         self.assertEqual(info["id"], 10001)
 
@@ -81,7 +81,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/Br_U_0803_M/100001_at/values")
         self.assertEqual(response.status, 200)
 
-        values = json.loads(body)
+        values = envelope_data(body)
         self.assertTrue(values)
         self.assertIn("BXD1", {v["name"] for v in values})
 
@@ -91,7 +91,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/BXD/10001/values")
         self.assertEqual(response.status, 200)
 
-        values = json.loads(body)
+        values = envelope_data(body)
         self.assertTrue(values)
         self.assertIn("BXD1", {v["name"] for v in values})
 
@@ -101,7 +101,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/Br_U_0803_M")
         self.assertEqual(response.status, 200)
 
-        traits = json.loads(body)
+        traits = envelope_data(body)
         self.assertTrue(traits)
         self.assertTrue(all(t["category"] == "probeset" for t in traits))
         self.assertIn("100001_at", {t["name"] for t in traits})
@@ -112,7 +112,7 @@ class TraitsTest(ServerTestCase):
         response, body = self.get("/traits/BXD")
         self.assertEqual(response.status, 200)
 
-        traits = json.loads(body)
+        traits = envelope_data(body)
         self.assertTrue(traits)
         self.assertTrue(all(t["category"] == "publish" for t in traits))
         self.assertIn(10001, {t["id"] for t in traits})