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
1diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
2index 5c69eb9..51e5984 100644
3--- a/src/reactive/grafana.py
4+++ b/src/reactive/grafana.py
5@@ -1162,6 +1162,7 @@ def ensure_dash_deserialized(dash):
6
7 @hook("dashboards-relation-joined")
8 def dashboards_joined(dashboards):
9+ """Process dashboards from related charms."""
10 hookenv.log("hook %s triggered" % hookenv.hook_name(), "INFO")
11
12 remote_unit = os.environ.get("JUJU_REMOTE_UNIT", None)
13diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
14index 83dc8ad..4fa664a 100644
15--- a/src/tests/functional/tests/test_grafana.py
16+++ b/src/tests/functional/tests/test_grafana.py
17@@ -77,7 +77,7 @@ class BaseGrafanaTest(unittest.TestCase):
18 model.run_on_unit(unit, " ".join(cmd))
19
20 def verify_iterative_backups(self):
21- """Wait for new backups to appear to ensure they work"""
22+ """Wait for new backups to appear to ensure they work."""
23 time.sleep(65)
24 backupdir = model.run_on_unit(
25 self.lead_unit_name,
26@@ -222,7 +222,7 @@ class CharmOperationTest(BaseGrafanaTest):
27 self.assertTrue("name" in req.json())
28
29 def test_13_grafana_dashboard_backup(self):
30- """Run dashboard-backup items"""
31+ """Run dashboard-backup items."""
32 model.set_application_config(
33 self.application_name,
34 {"dashboards_backup_schedule": "* * * * *"},
35@@ -237,7 +237,7 @@ class CharmOperationTest(BaseGrafanaTest):
36 self.verify_iterative_backups()
37
38 def test_14_grafana_dashboard_backup_port_change(self):
39- """Run dashboard backup and test a port change"""
40+ """Run dashboard backup and test a port change."""
41 port = "4321"
42 model.set_application_config(
43 self.application_name, {"dashboards_backup_schedule": "* * * * *"}

Subscribers

People subscribed via source and target branches