Try to improve test stability

grafana-toolbox · Jan 22, 2022 · dc9ac0f · dc9ac0f
1 parent c33b87c
commit dc9ac0f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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):