Merge pull request #490 from willcl-ark/fix-logging-test-timeouts

Author: willcl-ark

.github/workflows/test.yml

@@ -15,14 +15,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: eifinger/setup-uv@v1
       - run: uvx ruff check .
 
   ruff-format:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: curl -LsSf https://astral.sh/uv/install.sh | sh
+      - uses: eifinger/setup-uv@v1
       - run: uvx ruff format . --check
 
   test:
@@ -34,10 +34,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: azure/[email protected]
-      - uses: medyagh/setup-minikube@master
-      - name: Install uv
-        run: |
-          curl -LsSf https://astral.sh/uv/install.sh | sh
+      - name: start minikube
+        uses: medyagh/setup-minikube@latest
+        id: minikube
+        with:
+          cpus: max
+          memory: 4000m
+      - uses: eifinger/setup-uv@v1
       - name: Install project
         run: uv sync --all-extras --dev
       - name: Run tests

test/logging_test.py

@@ -80,7 +80,10 @@ def make_grafana_api_request(self, ds_uid, start, metric):
             "to": "now",
         }
         reply = requests.post("http://localhost:3000/api/ds/query", json=data)
-        assert reply.status_code == 200
+        if reply.status_code != 200:
+            self.log.error(f"Grafana API request failed with status code {reply.status_code}")
+            self.log.error(f"Response content: {reply.text}")
+            return None
 
         # Default ref ID is "A", only inspecting one "frame"
         return reply.json()["results"]["A"]["frames"][0]["data"]["values"]
@@ -102,6 +105,9 @@ def test_prometheus_and_grafana(self):
 
         def get_five_values_for_metric(metric):
             data = self.make_grafana_api_request(prometheus_uid, start, metric)
+            if data is None:
+                self.log.info(f"Failed to get Grafana data for {metric}")
+                return False
             if len(data) < 1:
                 self.log.info(f"No Grafana data yet for {metric}")
                 return False