refactor: update RPC client usage in license checkout tests

Author: pcrespov

services/web/server/tests/unit/with_dbs/04/licenses/test_licenses_rpc.py

@@ -18,12 +18,7 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
-from servicelib.rabbitmq.rpc_interfaces.webserver.licenses.licensed_items import (
-    checkout_licensed_item_for_wallet,
-    get_available_licensed_items_for_wallet,
-    get_licensed_items,
-    release_licensed_item_for_wallet,
-)
+from servicelib.rabbitmq.rpc_interfaces.webserver.v1 import WebServerRpcClient
 from settings_library.rabbit import RabbitSettings
 from simcore_postgres_database.models.licensed_item_to_resource import (
     licensed_item_to_resource,
@@ -42,15 +37,23 @@
 ]
 
 
+@pytest.fixture(scope="session")
+def service_name() -> str:
+    # Overrides  service_name fixture needed in docker_compose_service_environment_dict fixture
+    return "wb-api-server"
+
+
 @pytest.fixture
 def app_environment(
     rabbit_service: RabbitSettings,
     app_environment: EnvVarsDict,
+    docker_compose_service_environment_dict: EnvVarsDict,
     monkeypatch: pytest.MonkeyPatch,
 ):
     new_envs = setenvs_from_dict(
         monkeypatch,
         {
+            **docker_compose_service_environment_dict,
             **app_environment,
             "RABBIT_HOST": rabbit_service.RABBIT_HOST,
             "RABBIT_PORT": f"{rabbit_service.RABBIT_PORT}",
@@ -124,7 +127,7 @@ def mock_release_licensed_item(mocker: MockerFixture) -> tuple:
 )
 async def test_license_checkout_workflow(
     client: TestClient,
-    rpc_client: RabbitMQRPCClient,
+    webserver_rpc_client: WebServerRpcClient,
     osparc_product_name: ProductName,
     logged_user: UserInfoDict,
     pricing_plan_id: int,
@@ -135,8 +138,8 @@ async def test_license_checkout_workflow(
 ):
     assert client.app
 
-    result = await get_licensed_items(
-        rpc_client, product_name=osparc_product_name, offset=0, limit=20
+    result = await webserver_rpc_client.license.get_licensed_items(
+        product_name=osparc_product_name, offset=0, limit=20
     )
     assert len(result.items) == 0
     assert result.total == 0
@@ -176,23 +179,21 @@ async def test_license_checkout_workflow(
             )
         )
 
-    result = await get_licensed_items(
-        rpc_client, product_name=osparc_product_name, offset=0, limit=20
+    result = await webserver_rpc_client.license.get_licensed_items(
+        product_name=osparc_product_name, offset=0, limit=20
     )
     assert len(result.items) == 1
     assert result.total == 1
     assert isinstance(result, LicensedItemRpcGetPage)
 
     with pytest.raises(NotImplementedError):
-        await get_available_licensed_items_for_wallet(
-            rpc_client,
+        await webserver_rpc_client.license.get_available_licensed_items_for_wallet(
             user_id=logged_user["id"],
             product_name=osparc_product_name,
             wallet_id=1,
         )
 
-    checkout = await checkout_licensed_item_for_wallet(
-        rpc_client,
+    checkout = await webserver_rpc_client.license.checkout_licensed_item_for_wallet(
         product_name=osparc_product_name,
         user_id=logged_user["id"],
         wallet_id=1,
@@ -201,8 +202,7 @@ async def test_license_checkout_workflow(
         service_run_id="run_1",
     )
 
-    await release_licensed_item_for_wallet(
-        rpc_client,
+    await webserver_rpc_client.license.release_licensed_item_for_wallet(
         product_name=osparc_product_name,
         user_id=logged_user["id"],
         licensed_item_checkout_id=checkout.licensed_item_checkout_id,