Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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()})}",
)

Expand Down
6 changes: 4 additions & 2 deletions tests/e2e-playwright/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ def _construct_graylog_url(
scheme, tail = product_url.split("://", 1)
else:
scheme, tail = "https", "<UNDEFINED>"
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)}"
Expand All @@ -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
Expand All @@ -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)
Expand Down
Loading