Merge ~afreiberger/charm-grafana:lint-20.10 into charm-grafana:master

Proposed by Drew Freiberger
Status: Merged
Approved by: Alvaro Uria
Approved revision: 5cf11c5e2144b7c077f9deece2c43c775ab7c520
Merged at revision: 872e3cd23c11d2d960edadcd0dc60e5d97292e6e
Proposed branch: ~afreiberger/charm-grafana:lint-20.10
Merge into: charm-grafana:master
Prerequisite: ~afreiberger/charm-grafana:blacken-20.10
Diff against target: 43 lines (+4/-3)
2 files modified
src/reactive/grafana.py (+1/-0)
src/tests/functional/tests/test_grafana.py (+3/-3)
Reviewer Review Type Date Requested Status
Alvaro Uria Approve
Review via email: mp+392349@code.launchpad.net

Commit message

Minor doc strings linting

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
Canonical IS Mergebot (canonical-is-mergebot) wrote :

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

Revision history for this message
Alvaro Uria (aluria) wrote :

lgtm

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

Change successfully merged at revision 872e3cd23c11d2d960edadcd0dc60e5d97292e6e

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index 5c69eb9..51e5984 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -1162,6 +1162,7 @@ def ensure_dash_deserialized(dash):
11621162
1163@hook("dashboards-relation-joined")1163@hook("dashboards-relation-joined")
1164def dashboards_joined(dashboards):1164def dashboards_joined(dashboards):
1165 """Process dashboards from related charms."""
1165 hookenv.log("hook %s triggered" % hookenv.hook_name(), "INFO")1166 hookenv.log("hook %s triggered" % hookenv.hook_name(), "INFO")
11661167
1167 remote_unit = os.environ.get("JUJU_REMOTE_UNIT", None)1168 remote_unit = os.environ.get("JUJU_REMOTE_UNIT", None)
diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
index 83dc8ad..4fa664a 100644
--- a/src/tests/functional/tests/test_grafana.py
+++ b/src/tests/functional/tests/test_grafana.py
@@ -77,7 +77,7 @@ class BaseGrafanaTest(unittest.TestCase):
77 model.run_on_unit(unit, " ".join(cmd))77 model.run_on_unit(unit, " ".join(cmd))
7878
79 def verify_iterative_backups(self):79 def verify_iterative_backups(self):
80 """Wait for new backups to appear to ensure they work"""80 """Wait for new backups to appear to ensure they work."""
81 time.sleep(65)81 time.sleep(65)
82 backupdir = model.run_on_unit(82 backupdir = model.run_on_unit(
83 self.lead_unit_name,83 self.lead_unit_name,
@@ -222,7 +222,7 @@ class CharmOperationTest(BaseGrafanaTest):
222 self.assertTrue("name" in req.json())222 self.assertTrue("name" in req.json())
223223
224 def test_13_grafana_dashboard_backup(self):224 def test_13_grafana_dashboard_backup(self):
225 """Run dashboard-backup items"""225 """Run dashboard-backup items."""
226 model.set_application_config(226 model.set_application_config(
227 self.application_name,227 self.application_name,
228 {"dashboards_backup_schedule": "* * * * *"},228 {"dashboards_backup_schedule": "* * * * *"},
@@ -237,7 +237,7 @@ class CharmOperationTest(BaseGrafanaTest):
237 self.verify_iterative_backups()237 self.verify_iterative_backups()
238238
239 def test_14_grafana_dashboard_backup_port_change(self):239 def test_14_grafana_dashboard_backup_port_change(self):
240 """Run dashboard backup and test a port change"""240 """Run dashboard backup and test a port change."""
241 port = "4321"241 port = "4321"
242 model.set_application_config(242 model.set_application_config(
243 self.application_name, {"dashboards_backup_schedule": "* * * * *"}243 self.application_name, {"dashboards_backup_schedule": "* * * * *"}

Subscribers

People subscribed via source and target branches