Tests: Make test case for explore datasources use _two_ data sources

Author: amotl

CHANGES.rst

@@ -15,6 +15,7 @@ in progress
   all resources provisioned to Grafana.
 - Tests: Improve test quality, specifically for ``explore dashboards`` on
   Grafana 6 vs. Grafana >= 7
+- Tests: Make test case for `explore datasources` use _two_ data sources
 
 
 2022-02-03 0.13.1

tests/conftest.py

@@ -313,15 +313,22 @@ def grafana_version(docker_grafana):
     return grafana_version
 
 
-def mkdashboard(title: str, datasource: str):
+def mkdashboard(title: str, datasources: List[str]):
     """
-    Build dashboard with single panel.
+    Build dashboard with multiple panels, each with a different data source.
     """
     # datasource = grafanalib.core.DataSourceInput(name="foo", label="foo", pluginId="foo", pluginName="foo")
-    panel_gl = grafanalib.core.Panel(dataSource=datasource, gridPos={"h": 1, "w": 24, "x": 0, "y": 0})
-    dashboard_gl = grafanalib.core.Dashboard(title=title, panels=[panel_gl.panel_json(overrides={})])
+
+    # Build dashboard object model.
+    panels = []
+    for datasource in datasources:
+        panel = grafanalib.core.Panel(dataSource=datasource, gridPos={"h": 1, "w": 24, "x": 0, "y": 0})
+        panels.append(panel.panel_json(overrides={}))
+    dashboard = grafanalib.core.Dashboard(title=title, panels=panels)
+
+    # Render dashboard to JSON.
     dashboard_json = StringIO()
-    write_dashboard(dashboard_gl, dashboard_json)
+    write_dashboard(dashboard, dashboard_json)
     dashboard_json.seek(0)
     dashboard = json.loads(dashboard_json.read())
     return dashboard

tests/test_commands.py

@@ -244,26 +244,30 @@ def test_log_tabular_success(ldi_resources, capsys, caplog):
 
 def test_explore_datasources_used(create_datasource, create_dashboard, capsys, caplog):
 
-    # Create a datasource and a dashboard which uses it.
+    # Create two data sources and a dashboard which uses them.
     create_datasource(name="foo")
-    create_dashboard(mkdashboard(title="baz", datasource="foo"))
+    create_datasource(name="bar")
+    create_dashboard(mkdashboard(title="baz", datasources=["foo", "bar"]))
 
     # Compute breakdown.
     set_command("explore datasources", "--format=yaml")
 
     # Proof the output is correct.
     with caplog.at_level(logging.DEBUG):
         grafana_wtf.commands.run()
-        assert "Found 1 data source(s)" in caplog.messages
+        assert "Found 2 data source(s)" in caplog.messages
 
     captured = capsys.readouterr()
     data = yaml.safe_load(captured.out)
 
-    assert len(data["used"]) == 1
+    assert len(data["used"]) == 2
     assert len(data["unused"]) == 0
 
-    assert data["used"][0]["datasource"]["name"] == "foo"
+    # Results will be sorted by name, so `bar` comes first.
+    assert data["used"][0]["datasource"]["name"] == "bar"
     assert data["used"][0]["datasource"]["type"] == "testdata"
+    assert data["used"][1]["datasource"]["name"] == "foo"
+    assert data["used"][1]["datasource"]["type"] == "testdata"
 
 
 def test_explore_datasources_unused(create_datasource, capsys, caplog):