#150: Rename pytest fixture for ICAT data injection

ral-facilities · Nov 23, 2020 · a3c16e1 · a3c16e1
1 parent ebf8b2e
commit a3c16e1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/test/conftest.py b/test/conftest.py
@@ -23,7 +23,7 @@ def icat_query(icat_client):
 
 
 @pytest.fixture()
-def add_single_investigation_test_data(icat_client):
+def single_investigation_test_data(icat_client):
     # Inject data
     investigation = icat_client.new("investigation")
     investigation.name = "Test Data for DataGateway API Testing"

diff --git a/test/icat/test_query.py b/test/icat/test_query.py
@@ -23,9 +23,8 @@ def test_invalid_query_creation(self, icat_client):
         with pytest.raises(PythonICATError):
             ICATQuery(icat_client, "User", conditions={"invalid": "invalid"})
 
-    # @pytest.mark.usefixtures("")
     def test_valid_query_exeuction(
-        self, icat_client, add_single_investigation_test_data,
+        self, icat_client, single_investigation_test_data,
     ):
         test_query = ICATQuery(icat_client, "Investigation")
         test_data_filter = PythonICATWhereFilter(
@@ -40,7 +39,7 @@ def test_valid_query_exeuction(
             remove_meta_attributes(entity_dict)
             query_output_dicts.append(entity_dict)
 
-        assert query_output_dicts == add_single_investigation_test_data
+        assert query_output_dicts == single_investigation_test_data
 
     def test_invalid_query_execution(self, icat_client):
         # Try to get ICATValidationError raised