Merge pull request #307 from EdwardBetts/main

Remove pytest marks from fixtures so tests work with PyTest 9

Author: HerrMuellerluedenscheid

tests/contrib/test_db_plugin.py

@@ -40,15 +40,13 @@ def db_connection(db_file):
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def user_manager(password_hasher, db_connection):
     um = UserManager(db_connection)
     await um.db_sync()
     yield um
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def topic_manager(password_hasher, db_connection):
     tm = TopicManager(db_connection)
     await tm.db_sync()

tests/contrib/test_db_scripts.py

@@ -36,15 +36,13 @@ def db_connection(db_file):
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def user_manager(password_hasher, db_connection):
     um = UserManager(db_connection)
     await um.db_sync()
     yield um
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def topic_manager(password_hasher, db_connection):
     tm = TopicManager(db_connection)
     await tm.db_sync()
@@ -417,4 +415,3 @@ async def test_topic_mgr_cli():
     stdout, stderr = await proc.communicate()
 
     assert proc.returncode == 0, f"topic_mgr error code: {proc.returncode} - {stdout} - {stderr}"
-

tests/contrib/test_shadows.py

@@ -32,7 +32,6 @@ def db_connection(db_file):
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def db_session_maker(db_connection):
     engine = create_async_engine(f"{db_connection}")
     db_session_maker = async_sessionmaker(engine, expire_on_commit=False)
@@ -41,7 +40,6 @@ async def db_session_maker(db_connection):
 
 
 @pytest.fixture
-@pytest.mark.asyncio
 async def shadow_plugin(db_connection):
 
     cfg = ShadowPlugin.Config(connection=db_connection)