test(taskqueue): clean up unnecessary fixtures

Author: TheKevJames

taskqueue/tests/integration/conftest.py

@@ -2,14 +2,6 @@
 import os
 
 import pytest
-from gcloud.aio.auth import BUILD_GCLOUD_REST  # pylint: disable=no-name-in-module
-from gcloud.aio.taskqueue import PushQueue
-
-# Selectively load libraries based on the package
-if BUILD_GCLOUD_REST:
-    from requests import Session
-else:
-    from aiohttp import ClientSession as Session
 
 
 def pytest_configure(config):
@@ -37,20 +29,3 @@ def push_queue_name() -> str:
 @pytest.fixture(scope='module')
 def push_queue_location() -> str:
     return 'us-west2'
-
-
-@pytest.fixture(scope='function')
-async def session() -> str:
-    async with Session() as session:
-        yield session
-
-
-@pytest.fixture(scope='function')
-async def push_queue(
-    project, creds, push_queue_name, push_queue_location,
-    session,
-):
-    return PushQueue(
-        project, push_queue_name, service_file=creds,
-        location=push_queue_location, session=session,
-    )

taskqueue/tests/integration/pushqueue_test.py

@@ -1,10 +1,13 @@
 import datetime
 
 import pytest
+from gcloud.aio.taskqueue import PushQueue
 
 
 @pytest.mark.asyncio
-async def test_task_lifecycle_in_push_queue(push_queue):
+async def test_task_lifecycle_in_push_queue(
+        project, creds, push_queue_name, push_queue_location
+):
     # Set to run in the future, giving us enough time to test all
     # functionalities before the task gets dispatched automatically.
     schedule_time = (datetime.datetime.now(datetime.timezone.utc)
@@ -20,22 +23,26 @@ async def test_task_lifecycle_in_push_queue(push_queue):
         },
     }
 
-    # CREATE
-    created = await push_queue.create(task)
-    assert created
-
-    try:
-        # GET
-        assert created == await push_queue.get(created['name'], full=True)
-
-        # LIST
-        listed = await push_queue.list(full=True)
-        assert listed.get('tasks')
-        assert created in listed['tasks']
-
-        # RUN
-        run = await push_queue.run(created['name'], full=True)
-        assert all(item in run.items() for item in created.items())
-    finally:
-        # DELETE
-        assert not await push_queue.delete(created['name'])
+    async with PushQueue(
+        project, push_queue_name, service_file=creds,
+        location=push_queue_location,
+    ) as push_queue:
+        # CREATE
+        created = await push_queue.create(task)
+        assert created
+
+        try:
+            # GET
+            assert created == await push_queue.get(created['name'], full=True)
+
+            # LIST
+            listed = await push_queue.list(full=True)
+            assert listed.get('tasks')
+            assert created in listed['tasks']
+
+            # RUN
+            run = await push_queue.run(created['name'], full=True)
+            assert all(item in run.items() for item in created.items())
+        finally:
+            # DELETE
+            assert not await push_queue.delete(created['name'])