From 3a218b4e374517e2ab15838af0d8aa0e7a937320 Mon Sep 17 00:00:00 2001 From: Michael Thamm Date: Wed, 8 Jan 2025 11:45:41 -0500 Subject: [PATCH] fix scenario test group naming --- requirements.txt | 2 +- tests/scenario/test_alert_labels.py | 2 +- tox.ini | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index de9661d..9114d86 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # FIXME: Packing the charm with 2.2.0+139.gd011d92 will not include dependencies in PYDEPS key: # https://chat.charmhub.io/charmhub/pl/wngp665ycjnb78ar9ojrfhxjkr # That's why we are including cosl here until the bug in charmcraft is solved -cosl < 0.0.49 +cosl ops > 2.5.0 pydantic < 2 requests diff --git a/tests/scenario/test_alert_labels.py b/tests/scenario/test_alert_labels.py index bfeda06..c7f436a 100644 --- a/tests/scenario/test_alert_labels.py +++ b/tests/scenario/test_alert_labels.py @@ -120,7 +120,7 @@ def test_metrics_alert_rule_labels(charm_config): ) for group in alert_rules["groups"]: for rule in group["rules"]: - if "grafana-agent_alertgroup_alerts" in group["name"]: + if "grafana_agent_alertgroup_alerts" in group["name"]: assert ( rule["labels"]["juju_application"] == "primary" or rule["labels"]["juju_application"] == "subordinate" diff --git a/tox.ini b/tox.ini index b7f86a3..a30244b 100644 --- a/tox.ini +++ b/tox.ini @@ -69,7 +69,7 @@ description = Run scenario tests on LXD deps = -r{toxinidir}/requirements.txt pytest - cosl<0.0.49 + cosl ops[testing] commands = pytest -vv --tb native --log-cli-level=INFO -s {posargs} {[vars]tst_path}/scenario