Merge ~xavpaice/charm-grafana:blacken into charm-grafana:master

Proposed by Xav Paice
Status: Merged
Approved by: Drew Freiberger
Approved revision: 289866e4d3c79df03fb23e1793056d9b1136654e
Merged at revision: d732550248323f45272488b9e7790bfa7313274c
Proposed branch: ~xavpaice/charm-grafana:blacken
Merge into: charm-grafana:master
Diff against target: 34 lines (+8/-4)
2 files modified
src/reactive/grafana.py (+3/-1)
src/tests/functional/tests/test_grafana.py (+5/-3)
Reviewer Review Type Date Requested Status
Drew Freiberger Approve
Review via email: mp+397055@code.launchpad.net

Commit message

Reformat to pass lint

To post a comment you must log in.
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Drew Freiberger (afreiberger) wrote :

LGTM, thanks!

review: Approve
Revision history for this message
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Change successfully merged at revision d732550248323f45272488b9e7790bfa7313274c

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
2index 04b7c27..f9e9a94 100644
3--- a/src/reactive/grafana.py
4+++ b/src/reactive/grafana.py
5@@ -887,7 +887,9 @@ def generate_prometheus_dashboards(gf_adminpasswd, ds):
6 "Exception while trying to reach prometheus API: {}".format(e),
7 "ERROR",
8 )
9- hookenv.status_set("blocked", "Exception reaching prometheus API whilst updating dashboards")
10+ hookenv.status_set(
11+ "blocked", "Exception reaching prometheus API whilst updating dashboards"
12+ )
13 return
14
15 if response.status_code != 200:
16diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
17index 5832fe0..d0e54d4 100644
18--- a/src/tests/functional/tests/test_grafana.py
19+++ b/src/tests/functional/tests/test_grafana.py
20@@ -252,9 +252,11 @@ class CharmOperationTest(BaseGrafanaTest):
21 self.verify_iterative_backups()
22
23 def test_15_grafana_datasource_updates(self):
24- """
25- Change the port on the associated datasource.
26- Ensures the model returns to idle after changing the prometheus port post deployment.
27+ """Change the port on the associated datasource.
28+
29+ Ensures the model returns to idle after changing the prometheus port post
30+ deployment.
31+
32 As per LP #1893320
33 """
34 datasource_application = "prometheus"

Subscribers

People subscribed via source and target branches