Fixing deprecation warning in tests: @pytest.yield_fixture -> @pytest.fixture

Author: adamcharnock

tests/client/internal_messaging/conftest.py

@@ -7,7 +7,7 @@
 from lightbus.utilities.internal_queue import InternalQueue
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def consumer():
     def _on_exception(e):
         raise e
@@ -17,7 +17,7 @@ def _on_exception(e):
     await consumer.close()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def producer():
     def _on_exception(e):
         raise e

tests/client/test_validator_unit.py

@@ -13,7 +13,7 @@
 pytestmark = pytest.mark.unit
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def create_bus_client_with_unhappy_schema(mocker, dummy_bus):
     """Schema which always fails to validate"""
 

tests/conftest.py

@@ -176,7 +176,7 @@ async def redis_pool(create_redis_pool, loop):
     return await create_redis_pool()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def redis_client(create_redis_client, loop):
     """Returns Redis client instance."""
     redis = await create_redis_client()
@@ -206,7 +206,7 @@ async def _get_total_redis_connections():
     return _get_total_redis_connections
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def _closable(loop):
     conns = []
 
@@ -225,7 +225,7 @@ def _closable(loop):
 # Lightbus fixtures
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def dummy_bus(loop, redis_server_url):
     # fmt: off
     dummy_bus = lightbus.creation.create(
@@ -255,7 +255,7 @@ def dummy_bus(loop, redis_server_url):
         pass
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def dummy_listener(dummy_bus: BusPath, loop):
     """Start the dummy bus consuming events"""
     # TODO: Remove. Barely used any more
@@ -375,7 +375,7 @@ def dummy_api():
     return DummyApi()
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def tmp_file():
     f = NamedTemporaryFile("r+", encoding="utf8")
     yield f
@@ -385,7 +385,7 @@ def tmp_file():
         pass
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def tmp_directory():
     f = TemporaryDirectory()
     yield Path(f.name)
@@ -410,7 +410,7 @@ def _set_env(**environ):
     return _set_env
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def make_test_bus_module():
     """Create a python module on disk which contains a bus, and put it on the python path"""
     created_modules = []
@@ -554,7 +554,7 @@ class Meta:
 """
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 async def redis_config_file(loop, redis_server_url, redis_client):
     config = REDIS_BUS_CONFIG.format(redis_url=redis_server_url)
     with NamedTemporaryFile() as f:
@@ -564,15 +564,15 @@ async def redis_config_file(loop, redis_server_url, redis_client):
         await redis_client.execute(b"CLIENT", b"KILL", b"TYPE", b"NORMAL")
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def debug_config_file():
     with NamedTemporaryFile() as f:
         f.write(DEBUG_BUS_CONFIG.encode("utf8"))
         f.flush()
         yield f.name
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def run_lightbus_command(make_test_bus_module, redis_config_file):
     processes = []
 
@@ -658,7 +658,7 @@ def queue_mocker() -> Type[BusQueueMockerContext]:
     return BusQueueMockerContext
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def error_queue():
     queue = InternalQueue()
     yield queue
@@ -705,7 +705,7 @@ async def worker_context(bus):
         return worker_context(bus)
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def worker(new_bus):
     yield Worker(bus_factory=new_bus)
 
@@ -803,7 +803,7 @@ def _docker_available():
     return docker_cmd.returncode == 0
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def standalone_redis_server():
     if not _docker_available():
         raise pytest.skip("Docker not available")

tests/test_testing.py

@@ -8,7 +8,7 @@
 pytestmark = pytest.mark.unit
 
 
-@pytest.yield_fixture
+@pytest.fixture
 def mock_result(dummy_bus):
     with BusQueueMockerContext(dummy_bus) as mocker_context:
         yield testing.MockResult(mocker_context, mock_responses={}, mock_events=set())

tests/transports/redis/conftest.py

@@ -29,7 +29,7 @@ async def redis_result_transport(new_redis_pool, loop):
     )
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def redis_event_transport(new_redis_pool, loop):
     transport = lightbus.transports.redis.event.RedisEventTransport(
         redis_pool=await new_redis_pool(maxsize=10000),
@@ -49,7 +49,7 @@ async def redis_schema_transport(new_redis_pool, loop):
     )
 
 
-@pytest.yield_fixture
+@pytest.fixture
 async def bus(new_bus):
     bus = new_bus()
 

tests/transports/test_pool.py

@@ -22,7 +22,7 @@
 pytestmark = pytest.mark.unit
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 async def dummy_pool():
     pool = TransportPool(
         transport_class=DebugEventTransport,
@@ -33,7 +33,7 @@ async def dummy_pool():
     await pool.close()
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 async def redis_pool(redis_server_url):
     pool = TransportPool(
         transport_class=RedisEventTransport,
@@ -44,7 +44,7 @@ async def redis_pool(redis_server_url):
     await pool.close()
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 async def attr_test_pool(redis_server_url):
     """Used for testing attribute access only"""
 
@@ -69,7 +69,7 @@ async def _async_private_method(self):
     await pool.close()
 
 
-@pytest.yield_fixture()
+@pytest.fixture()
 def run_in_many_threads():
     def run_in_many_threads_(async_fn, max_workers=50, executions=200, *args, **kwargs):
         with ThreadPoolExecutor(max_workers=max_workers) as e: