Fix test typing and fixture usage

Author: edan-bainglass

tests/conftest.py

@@ -174,7 +174,7 @@ def default_nodes():
 
 @pytest.fixture(scope='function')
 def array_data_node():
-    """Populate database with downloadable node (implmenting a _prepare_* function)."""
+    """Populate database with downloadable node (implementing a _prepare_* function)."""
 
     return orm.ArrayData(np.arange(4)).store()
 
@@ -213,7 +213,7 @@ def mutate_mapping(
 
 @pytest.fixture
 def orm_regression(data_regression):
-    """A variant of data_regression.check, that replaces nondetermistic fields (like uuid)."""
+    """A variant of data_regression.check, that replaces non-deterministic fields (like uuid)."""
 
     def _func(
         data: dict,
@@ -289,7 +289,7 @@ def _func(
         level_name: str = 'level 1',
         message='',
         node: Optional[orm.nodes.Node] = None,
-    ) -> orm.Comment:
+    ) -> orm.Log:
         orm_node = node or orm.Data().store()
         return orm.Log(datetime.now(pytz.UTC), loggername, level_name, orm_node.pk, message=message).store()
 

tests/test_auth.py

@@ -2,12 +2,8 @@
 
 from fastapi.testclient import TestClient
 
-from aiida_restapi import app
 
-client = TestClient(app)
-
-
-def test_authenticate_user():
+def test_authenticate_user(client: TestClient):
     """Test authenticating as a user."""
     # authenticate with username and password
     response = client.post('/token', data={'username': 'johndoe@example.com', 'password': 'secret'})

tests/test_computers.py

@@ -1,30 +1,34 @@
 """Test the /computers endpoint"""
 
+import pytest
 from aiida import orm
+from fastapi.testclient import TestClient
 
 
-def test_get_computer_projectable_properties(client):
+def test_get_computer_projectable_properties(client: TestClient):
     """Test get projectable properties for computer."""
     response = client.get('/computers/projectable_properties')
     assert response.status_code == 200
     assert response.json() == sorted(orm.Computer.fields.keys())
 
 
-def test_get_computers(default_computers, client):  # pylint: disable=unused-argument
+@pytest.mark.usefixtures('default_computers')
+def test_get_computers(client: TestClient):
     """Test listing existing computer."""
     response = client.get('/computers/')
     assert response.status_code == 200
     assert len(response.json()['results']) == 2
 
 
-def test_get_computer(default_computers, client):  # pylint: disable=unused-argument
+def test_get_computer(client: TestClient, default_computers):
     """Test retrieving a single computer."""
     for comp_id in default_computers:
         response = client.get(f'/computers/{comp_id}')
         assert response.status_code == 200
 
 
-def test_create_computer(client, authenticate):  # pylint: disable=unused-argument
+@pytest.mark.usefixtures('authenticate')
+def test_create_computer(client: TestClient):
     """Test creating a new computer."""
     response = client.post(
         '/computers',

tests/test_daemon.py

@@ -3,13 +3,9 @@
 import pytest
 from fastapi.testclient import TestClient
 
-from aiida_restapi import app
-
-client = TestClient(app)
-
 
 @pytest.mark.usefixtures('stopped_daemon_client', 'authenticate')
-def test_status_and_start():
+def test_status_and_start(client: TestClient):
     """Test ``/daemon/status`` when the daemon is not running and ``/daemon/start``."""
     response = client.get('/daemon/status')
     assert response.status_code == 200, response.content
@@ -30,7 +26,7 @@ def test_status_and_start():
 
 
 @pytest.mark.usefixtures('started_daemon_client', 'authenticate')
-def test_status_and_stop():
+def test_status_and_stop(client: TestClient):
     """Test ``/daemon/status`` when the daemon is running and ``/daemon/stop``."""
     response = client.get('/daemon/status')
     assert response.status_code == 200, response.content

tests/test_graphql/test_comments.py

@@ -13,7 +13,7 @@ def test_comment(create_comment, orm_regression):
     fields = field_names_from_orm(type(comment))
     schema = create_schema([CommentQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ comment(id: %r) { %s } }' % (comment.id, ' '.join(fields)))
+    executed = client.execute('{ comment(id: %r) { %s } }' % (comment.pk, ' '.join(fields)))
     orm_regression(executed)
 
 

tests/test_graphql/test_computers.py

@@ -13,7 +13,7 @@ def test_computer(create_computer, orm_regression):
     fields = field_names_from_orm(type(computer))
     schema = create_schema([ComputerQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ computer(id: %r) { %s } }' % (computer.id, ' '.join(fields)))
+    executed = client.execute('{ computer(id: %r) { %s } }' % (computer.pk, ' '.join(fields)))
     orm_regression(executed)
 
 
@@ -24,7 +24,7 @@ def test_computer_nodes(create_computer, create_node, orm_regression):
     create_node(label='node 2', computer=computer)
     schema = create_schema([ComputerQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ computer(id: %r) { nodes { count rows{ label } } } }' % (computer.id))
+    executed = client.execute('{ computer(id: %r) { nodes { count rows{ label } } } }' % (computer.pk))
     orm_regression(executed)
 
 

tests/test_graphql/test_full.py

@@ -9,5 +9,5 @@ def test_full(create_node, orm_regression):
     """Test loading the full schema."""
     node = create_node(label='node 1')
     client = Client(SCHEMA)
-    executed = client.execute('{ aiidaVersion node(id: %r) { label } }' % (node.id))
+    executed = client.execute('{ aiidaVersion node(id: %r) { label } }' % (node.pk))
     orm_regression(executed)

tests/test_graphql/test_groups.py

@@ -13,7 +13,7 @@ def test_group(create_group, orm_regression):
     fields = field_names_from_orm(type(group))
     schema = create_schema([GroupQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ group(id: %r) { %s } }' % (group.id, ' '.join(fields)))
+    executed = client.execute('{ group(id: %r) { %s } }' % (group.pk, ' '.join(fields)))
     orm_regression(executed)
 
 
@@ -34,7 +34,7 @@ def test_group_nodes(create_group, create_node, orm_regression):
     group.add_nodes([create_node(label='node 1'), create_node(label='node 2')])
     schema = create_schema([GroupQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ group(id: %r) { nodes { count rows{ label } } } }' % (group.id))
+    executed = client.execute('{ group(id: %r) { nodes { count rows{ label } } } }' % (group.pk))
     orm_regression(executed)
 
 

tests/test_graphql/test_logs.py

@@ -13,7 +13,7 @@ def test_log(create_log, orm_regression):
     fields = field_names_from_orm(type(log))
     schema = create_schema([LogQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ log(id: %r) { %s } }' % (log.id, ' '.join(fields)))
+    executed = client.execute('{ log(id: %r) { %s } }' % (log.pk, ' '.join(fields)))
     orm_regression(executed)
 
 

tests/test_graphql/test_nodes.py

@@ -14,7 +14,7 @@ def test_node(create_node, orm_regression):
     fields = field_names_from_orm(type(node))
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ node(id: %r) { %s } }' % (node.id, ' '.join(fields)))
+    executed = client.execute('{ node(id: %r) { %s } }' % (node.pk, ' '.join(fields)))
     orm_regression(executed)
 
 
@@ -25,7 +25,7 @@ def test_node_logs(create_node, create_log, orm_regression):
     create_log(message='log 2', node=node)
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ node(id: %r) { logs { count rows{ message } } } }' % (node.id))
+    executed = client.execute('{ node(id: %r) { logs { count rows{ message } } } }' % (node.pk))
     orm_regression(executed)
 
 
@@ -36,7 +36,7 @@ def test_node_comments(create_node, create_comment, orm_regression):
     create_comment(content='comment 2', node=node)
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ node(id: %r) { comments { count rows{ content } } } }' % (node.id))
+    executed = client.execute('{ node(id: %r) { comments { count rows{ content } } } }' % (node.pk))
     orm_regression(executed)
 
 
@@ -53,7 +53,7 @@ def test_node_incoming(create_node, orm_regression):
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
     executed = client.execute(
-        '{ node(id: %r) { incoming { count rows{ node { label } link { label type } } } } }' % (node.id)
+        '{ node(id: %r) { incoming { count rows{ node { label } link { label type } } } } }' % (node.pk)
     )
     orm_regression(executed)
 
@@ -72,7 +72,7 @@ def test_node_outgoing(create_node, orm_regression):
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
     executed = client.execute(
-        '{ node(id: %r) { outgoing { count rows{ node { label } link { label type } } } } }' % (node.id)
+        '{ node(id: %r) { outgoing { count rows{ node { label } link { label type } } } } }' % (node.pk)
     )
     orm_regression(executed)
 
@@ -89,7 +89,7 @@ def test_node_ancestors(create_node, orm_regression):
 
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ node(id: %r) { ancestors { count rows{ label } } } }' % (node.id))
+    executed = client.execute('{ node(id: %r) { ancestors { count rows{ label } } } }' % (node.pk))
     orm_regression(executed)
 
 
@@ -106,7 +106,7 @@ def test_node_descendants(create_node, orm_regression):
 
     schema = create_schema([NodeQueryPlugin])
     client = Client(schema)
-    executed = client.execute('{ node(id: %r) { descendants { count rows{ label } } } }' % (node.id))
+    executed = client.execute('{ node(id: %r) { descendants { count rows{ label } } } }' % (node.pk))
     orm_regression(executed)