Prevent getting test snapshot updates getting stuck

Author: blast-hardcheese

tests/codegen/test_rpc.py

@@ -1,5 +1,6 @@
 import asyncio
 import importlib
+import os
 import shutil
 from datetime import timedelta
 from pathlib import Path
@@ -19,7 +20,8 @@
 
 @pytest.fixture(scope="session", autouse=True)
 def generate_rpc_client() -> None:
-    shutil.rmtree("tests/codegen/rpc/generated")
+    shutil.rmtree("tests/codegen/rpc/generated", ignore_errors=True)
+    os.makedirs("tests/codegen/rpc/generated")
 
     def file_opener(path: Path) -> TextIO:
         return open(path, "w")
@@ -34,12 +36,14 @@ def file_opener(path: Path) -> TextIO:
         method_filter=None,
     )
 
+@pytest.fixture(scope="session", autouse=True)
+def reload_rpc_import(generate_rpc_client: None) -> None:
+    import tests.codegen.rpc.generated
+    importlib.reload(tests.codegen.rpc.generated)
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize("handlers", [{**basic_rpc_method}])
 async def test_basic_rpc(client: Client) -> None:
-    import tests.codegen.rpc.generated
-    importlib.reload(tests.codegen.rpc.generated)
     from tests.codegen.rpc.generated import RpcClient
 
     res = await RpcClient(client).test_service.rpc_method(
@@ -69,8 +73,6 @@ async def rpc_timeout_handler(request: str, context: grpc.aio.ServicerContext) -
 @pytest.mark.asyncio
 @pytest.mark.parametrize("handlers", [{**rpc_timeout_method}])
 async def test_rpc_timeout(client: Client) -> None:
-    import tests.codegen.rpc.generated
-    importlib.reload(tests.codegen.rpc.generated)
     from tests.codegen.rpc.generated import RpcClient
 
     with pytest.raises(RiverException):