diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py b/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py index 76693b90d484..38539f0d7fb7 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py @@ -226,7 +226,7 @@ def __call__(self, message: str) -> bool: self.logger.info( "Current startup progress [expected number of node-progress-types=%d]: %s", - NodeProgressType.required_types_for_started_service(), + len(NodeProgressType.required_types_for_started_service()), f"{json.dumps({k:round(v,1) for k,v in self._current_progress.items()})}", ) diff --git a/tests/e2e-playwright/tests/conftest.py b/tests/e2e-playwright/tests/conftest.py index 1136e4035cbc..0a90d6fd7466 100644 --- a/tests/e2e-playwright/tests/conftest.py +++ b/tests/e2e-playwright/tests/conftest.py @@ -144,7 +144,7 @@ def _construct_graylog_url( scheme, tail = product_url.split("://", 1) else: scheme, tail = "https", "" - monitoring_url = f"{scheme}://monitoring.{tail}" + monitoring_url = f"{scheme}://monitoring.{tail}".rstrip("/") # build graylog URL query = f"from={start_time.strftime(_FORMAT)}&to={end_time.strftime(_FORMAT)}" @@ -161,11 +161,13 @@ def pytest_runtest_makereport(item: pytest.Item, call): test_name = item.name test_location = item.location product_url = f"{item.config.getoption('--product-url', default=None)}" + is_billable = item.config.getoption("--product-billable", default=None) diagnostics = { "test_name": test_name, "test_location": test_location, "product_url": product_url, + "is_billable": is_billable, } # Get the start and end times of the test @@ -182,7 +184,7 @@ def pytest_runtest_makereport(item: pytest.Item, call): logging.WARNING, f"ℹ️ Diagnostics report for {test_name} ---", # noqa: RUF001 ) as ctx: - ctx.logger.warning(json.dumps(diagnostics, indent=2)) + ctx.logger.warning("\n%s", json.dumps(diagnostics, indent=2)) @pytest.hookimpl(tryfirst=True)