From ca3c840d739b5b3314e7e648d4f7718eab94882a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Arnqvist?= Date: Mon, 9 Oct 2023 09:47:08 +0200 Subject: [PATCH] tests: Rename tests --- ...bats => grafana-dashboards-discovery.bats} | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) rename tests/end-to-end/{grafana-dashboard-discovery.bats => grafana-dashboards-discovery.bats} (85%) diff --git a/tests/end-to-end/grafana-dashboard-discovery.bats b/tests/end-to-end/grafana-dashboards-discovery.bats similarity index 85% rename from tests/end-to-end/grafana-dashboard-discovery.bats rename to tests/end-to-end/grafana-dashboards-discovery.bats index 281f9cfd3..ac769db81 100644 --- a/tests/end-to-end/grafana-dashboard-discovery.bats +++ b/tests/end-to-end/grafana-dashboards-discovery.bats @@ -14,7 +14,7 @@ grafana_logs() { kubectl -n monitoring logs "deployment/${1}" grafana | grep 'level=error' | sed -rn 's#.*dashboards/(.+) error="(.+)"#error: \1: \2#p' | sort -u } -@test "grafana admin dashboard discovery" { +@test "grafana admin - can discover dashboards" { with_kubeconfig "sc" run grafana_sc_dashboard_logs ops-grafana @@ -26,7 +26,15 @@ grafana_logs() { done } -@test "grafana dev dashboard discovery" { +@test "grafana admin - can load dashboards without error" { + with_kubeconfig "sc" + + run grafana_logs ops-grafana + + refute_output +} + +@test "grafana dev - can discover dashboards" { with_kubeconfig "sc" run grafana_sc_dashboard_logs user-grafana @@ -38,16 +46,7 @@ grafana_logs() { done } -@test "grafana admin dashboard load without error" { - with_kubeconfig "sc" - - run grafana_logs ops-grafana - - refute_output -} - - -@test "grafana dev dashboard load without error" { +@test "grafana dev - can load dashboards without error" { with_kubeconfig "sc" run grafana_logs user-grafana