Fix rebase

Author: eleftherioszisis

tests/test_subject.py

@@ -132,13 +132,13 @@ def test_update_one__public(client, json_data):
     assert data["error_code"] == "ENTITY_NOT_FOUND"
 
 
-def test_read_one(client, client_admin, model_id, json_data):
+def test_read_one(client, client_admin, model_id, json_data, json_data_partial):
     data = assert_request(client.get, url=f"{ROUTE}/{model_id}").json()
     _assert_read_response(data, json_data)
 
     # Test read subject without strain
-    model_id = assert_request(client.post, url=ROUTE, json=json_data_partial).json()["id"]
-    data = assert_request(client.get, url=f"{ROUTE}/{model_id}").json()
+    partial_model_id = assert_request(client.post, url=ROUTE, json=json_data_partial).json()["id"]
+    data = assert_request(client.get, url=f"{ROUTE}/{partial_model_id}").json()
     _assert_read_response(data, json_data_partial)
 
     data = assert_request(client_admin.get, url=f"{ADMIN_ROUTE}/{model_id}").json()