From 22718135be07f9873f18d65cc8b72a833a131c95 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke@nordu.net>
Date: Tue, 30 May 2023 12:40:37 +0200
Subject: [PATCH] Make test respond with valid json
---
brian_dashboard_manager/grafana/dashboard.py | 5 ++++-
test/test_grafana_dashboard.py | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/brian_dashboard_manager/grafana/dashboard.py b/brian_dashboard_manager/grafana/dashboard.py
index 0c1fc62..0190ec0 100644
--- a/brian_dashboard_manager/grafana/dashboard.py
+++ b/brian_dashboard_manager/grafana/dashboard.py
@@ -12,6 +12,7 @@ logger = logging.getLogger(__name__)
NUM_RETRIES = 3
+
def get_dashboard_definitions(dir=None):
"""
Returns dictionary for each dashboard JSON definition in supplied directory
@@ -240,9 +241,11 @@ def create_dashboard(request: TokenRequest, dashboard: dict, folder_id=None):
except HTTPError as e:
message = ''
if e.response is not None and e.response.status_code < 500:
+ # log the error message from Grafana
message = e.response.json()
logger.exception(f'Error when provisioning dashboard {title}: {message}')
+
+ # only retry on server side errors
if e.response is not None and e.response.status_code < 500:
- # only retry on server side errors
break
return None
diff --git a/test/test_grafana_dashboard.py b/test/test_grafana_dashboard.py
index effec70..e3da83f 100644
--- a/test/test_grafana_dashboard.py
+++ b/test/test_grafana_dashboard.py
@@ -195,7 +195,7 @@ def test_create_dashboard_no_uid_error(data_config):
assert 'id' not in body['dashboard']
# have already tested a successful response, respond with error here.
- return 400, {}, ''
+ return 400, {}, '{}'
responses.add_callback(
method=responses.POST,
--
GitLab