adds --product-billable

Author: pcrespov

tests/e2e-playwright/Makefile

@@ -168,7 +168,6 @@ define run_test
 	pytest -s $2 \
 		--color=yes \
 		--browser chromium \
-		--headed \
 		$$TEST_ARGS
 endef
 

tests/e2e-playwright/tests/conftest.py

@@ -25,8 +25,8 @@
 from pytest import Item
 from pytest_simcore.helpers.logging_tools import log_context
 from pytest_simcore.helpers.playwright import (
-    SECOND,
     MINUTE,
+    SECOND,
     AutoRegisteredUser,
     RunningState,
     ServiceType,
@@ -78,6 +78,12 @@ def pytest_addoption(parser: pytest.Parser) -> None:
         default=False,
         help="Whether product is billable or not",
     )
+    group.addoption(
+        "--product-lite",
+        action="store_true",
+        default=False,
+        help="Whether product is lite version or not",
+    )
     group.addoption(
         "--autoscaled",
         action="store_true",
@@ -224,13 +230,19 @@ def user_password(
 
 
 @pytest.fixture(scope="session")
-def product_billable(request: pytest.FixtureRequest) -> bool:
+def is_product_billable(request: pytest.FixtureRequest) -> bool:
     billable = request.config.getoption("--product-billable")
     return TypeAdapter(bool).validate_python(billable)
 
 
 @pytest.fixture(scope="session")
-def autoscaled(request: pytest.FixtureRequest) -> bool:
+def is_product_lite(request: pytest.FixtureRequest) -> bool:
+    enabled = request.config.getoption("--product-lite")
+    return TypeAdapter(bool).validate_python(enabled)
+
+
+@pytest.fixture(scope="session")
+def is_autoscaled(request: pytest.FixtureRequest) -> bool:
     autoscaled = request.config.getoption("--autoscaled")
     return TypeAdapter(bool).validate_python(autoscaled)
 
@@ -388,7 +400,7 @@ def log_in_and_out(
 def create_new_project_and_delete(
     page: Page,
     log_in_and_out: WebSocket,
-    product_billable: bool,
+    is_product_billable: bool,
     api_request_context: APIRequestContext,
     product_url: AnyUrl,
 ) -> Iterator[Callable[[tuple[RunningState], bool], dict[str, Any]]]:
@@ -407,15 +419,20 @@ def _(
         ), "misuse of this fixture! only 1 study can be opened at a time. Otherwise please modify the fixture"
         with log_context(
             logging.INFO,
-            f"Open project in {product_url=} as {product_billable=}",
+            f"Open project in {product_url=} as {is_product_billable=}",
         ) as ctx:
             waiter = SocketIOProjectStateUpdatedWaiter(expected_states=expected_states)
-            timeout = _OPENING_TUTORIAL_MAX_WAIT_TIME if template_id is not None else _OPENING_NEW_EMPTY_PROJECT_MAX_WAIT_TIME
+            timeout = (
+                _OPENING_TUTORIAL_MAX_WAIT_TIME
+                if template_id is not None
+                else _OPENING_NEW_EMPTY_PROJECT_MAX_WAIT_TIME
+            )
             with (
-                log_in_and_out.expect_event("framereceived", waiter, timeout=timeout + 10 * SECOND),
+                log_in_and_out.expect_event(
+                    "framereceived", waiter, timeout=timeout + 10 * SECOND
+                ),
                 page.expect_response(
-                    re.compile(r"/projects/[^:]+:open"),
-                    timeout=timeout + 5 * SECOND
+                    re.compile(r"/projects/[^:]+:open"), timeout=timeout + 5 * SECOND
                 ) as response_info,
             ):
                 # Project detail view pop-ups shows
@@ -436,8 +453,11 @@ def _(
                             # From the long running tasks response's urls, only their path is relevant
                             def url_to_path(url):
                                 return urllib.parse.urlparse(url).path
+
                             def wait_for_done(response):
-                                if url_to_path(response.url) == url_to_path(lrt_data["status_href"]):
+                                if url_to_path(response.url) == url_to_path(
+                                    lrt_data["status_href"]
+                                ):
                                     resp_data = response.json()
                                     resp_data = resp_data["data"]
                                     assert "task_progress" in resp_data
@@ -448,17 +468,20 @@ def wait_for_done(response):
                                         task_progress["message"],
                                     )
                                     return False
-                                if url_to_path(response.url) == url_to_path(lrt_data["result_href"]):
+                                if url_to_path(response.url) == url_to_path(
+                                    lrt_data["result_href"]
+                                ):
                                     copying_logger.logger.info("project created")
                                     return response.status == 201
                                 return False
+
                             with page.expect_response(wait_for_done, timeout=timeout):
                                 # if the above calls go to fast, this test could fail
                                 # not expected in the sim4life context though
                                 ...
                     else:
                         open_button.click()
-                if product_billable:
+                if is_product_billable:
                     # Open project with default resources
                     page.get_by_test_id("openWithResources").click()
             project_data = response_info.value.json()
@@ -497,7 +520,7 @@ def wait_for_done(response):
     for project_uuid in created_project_uuids:
         with log_context(
             logging.INFO,
-            f"Delete project with {project_uuid=} in {product_url=} as {product_billable=}",
+            f"Delete project with {project_uuid=} in {product_url=} as {is_product_billable=}",
         ):
             response = api_request_context.delete(
                 f"{product_url}v0/projects/{project_uuid}"

tests/e2e-playwright/tests/sim4life/test_sim4life.py

@@ -28,7 +28,7 @@ def test_sim4life(
     log_in_and_out: WebSocket,
     service_key: str,
     use_plus_button: bool,
-    autoscaled: bool,
+    is_autoscaled: bool,
     check_videostreaming: bool,
 ):
     if use_plus_button:
@@ -46,7 +46,11 @@ def test_sim4life(
     assert len(node_ids) == 1, "Expected 1 node in the workbench!"
 
     resp = wait_for_launched_s4l(
-        page, node_ids[0], log_in_and_out, autoscaled=autoscaled, copy_workspace=False
+        page,
+        node_ids[0],
+        log_in_and_out,
+        autoscaled=is_autoscaled,
+        copy_workspace=False,
     )
     s4l_websocket = resp["websocket"]
     s4l_iframe = resp["iframe"]

tests/e2e-playwright/tests/sim4life/test_template.py

@@ -23,7 +23,7 @@ def test_template(
     create_project_from_template_dashboard: Callable[[str], dict[str, Any]],
     log_in_and_out: WebSocket,
     template_id: str,
-    autoscaled: bool,
+    is_autoscaled: bool,
     check_videostreaming: bool,
 ):
     project_data = create_project_from_template_dashboard(template_id)
@@ -36,7 +36,7 @@ def test_template(
     assert len(node_ids) == 1, "Expected 1 node in the workbench!"
 
     resp = wait_for_launched_s4l(
-        page, node_ids[0], log_in_and_out, autoscaled=autoscaled, copy_workspace=True
+        page, node_ids[0], log_in_and_out, autoscaled=is_autoscaled, copy_workspace=True
     )
     s4l_websocket = resp["websocket"]
     s4l_iframe = resp["iframe"]

tests/e2e-playwright/tests/tip/test_ti_plan.py

@@ -86,11 +86,11 @@ def __call__(self, message: str) -> bool:
             return False
 
 
-def test_tip(  # noqa: PLR0915
+def test_classic_ti_plan(  # noqa: PLR0915
     page: Page,
     create_tip_plan_from_dashboard: Callable[[str], dict[str, Any]],
     log_in_and_out: WebSocket,
-    autoscaled: bool,
+    is_autoscaled: bool,
 ):
     project_data = create_tip_plan_from_dashboard("newTIPlanButton")
     assert "workbench" in project_data, "Expected workbench to be in project data!"
@@ -108,7 +108,7 @@ def test_tip(  # noqa: PLR0915
             websocket=log_in_and_out,
             timeout=(
                 _ELECTRODE_SELECTOR_AUTOSCALED_MAX_STARTUP_TIME
-                if autoscaled
+                if is_autoscaled
                 else _ELECTRODE_SELECTOR_MAX_STARTUP_TIME
             ),
             press_start_button=False,
@@ -155,7 +155,7 @@ def test_tip(  # noqa: PLR0915
             timeout=_OUTER_EXPECT_TIMEOUT_RATIO
             * (
                 _JLAB_AUTOSCALED_MAX_STARTUP_TIME
-                if autoscaled
+                if is_autoscaled
                 else _JLAB_MAX_STARTUP_MAX_TIME
             ),
         ) as ws_info:
@@ -165,7 +165,7 @@ def test_tip(  # noqa: PLR0915
                 websocket=log_in_and_out,
                 timeout=(
                     _JLAB_AUTOSCALED_MAX_STARTUP_TIME
-                    if autoscaled
+                    if is_autoscaled
                     else _JLAB_MAX_STARTUP_MAX_TIME
                 ),
                 press_start_button=False,
@@ -218,7 +218,7 @@ def test_tip(  # noqa: PLR0915
             websocket=log_in_and_out,
             timeout=(
                 _POST_PRO_AUTOSCALED_MAX_STARTUP_TIME
-                if autoscaled
+                if is_autoscaled
                 else _POST_PRO_MAX_STARTUP_TIME
             ),
             press_start_button=False,