From dc9ac0f6bdb7880b5f542232d26a88f80cd83500 Mon Sep 17 00:00:00 2001 From: Andreas Motl Date: Sat, 22 Jan 2022 01:07:56 +0100 Subject: [PATCH] Try to improve test stability --- grafana_wtf/core.py | 4 ++-- tests/test_commands.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/grafana_wtf/core.py b/grafana_wtf/core.py index e4a827c..bcc4a0c 100644 --- a/grafana_wtf/core.py +++ b/grafana_wtf/core.py @@ -407,8 +407,8 @@ def explore_datasources(self): else: results_unused.append(result) - results_used = sorted(results_used, key=lambda x: x["datasource"]["uid"] or x["datasource"]["name"]) - results_unused = sorted(results_unused, key=lambda x: x["datasource"]["uid"] or x["datasource"]["name"]) + results_used = sorted(results_used, key=lambda x: x["datasource"]["name"] or x["datasource"]["uid"]) + results_unused = sorted(results_unused, key=lambda x: x["datasource"]["name"] or x["datasource"]["uid"]) response = OrderedDict( used=results_used, diff --git a/tests/test_commands.py b/tests/test_commands.py index 213b536..a221fbd 100644 --- a/tests/test_commands.py +++ b/tests/test_commands.py @@ -233,7 +233,7 @@ def find_all_missing_datasources(data): for item in data: if "datasources_missing" in item: missing_items += item["datasources_missing"] - return sorted(missing_items, key=lambda x: x["uid"] or x["name"]) + return sorted(missing_items, key=lambda x: x["name"] or x["uid"]) def test_info(docker_grafana, capsys, caplog):