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

[Drew Freiberger]

blacken for 20.10 release

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

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

[Alvaro Uria (aluria)]

lgtm

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision cd329fa7b3c3aad85bf6faf24209530d65786f18

diff --git a/src/reactive/grafana.py b/src/reactive/grafana.py
index 3222c40..5c69eb9 100644
--- a/src/reactive/grafana.py
+++ b/src/reactive/grafana.py
@@ -1164,18 +1164,18 @@ def ensure_dash_deserialized(dash):
 def dashboards_joined(dashboards):
     hookenv.log("hook %s triggered" % hookenv.hook_name(), "INFO")
 
-    remote_unit = os.environ.get('JUJU_REMOTE_UNIT', None)
+    remote_unit = os.environ.get("JUJU_REMOTE_UNIT", None)
     if not remote_unit:
         hookenv.log("remote_unit is None, return", "WARNING")
         return
 
-    dashboard_str = hookenv.relation_get('dashboard', remote_unit)  # json str
+    dashboard_str = hookenv.relation_get("dashboard", remote_unit)  # json str
     if not dashboard_str:
         hookenv.log("dashboard field is empty, return", "WARNING")
         return
 
     dashboard = ensure_dash_deserialized(dashboard_str)
-    name = hookenv.relation_get('name', remote_unit)  # dashboard name
+    name = hookenv.relation_get("name", remote_unit)  # dashboard name
     remote_app = hookenv.remote_service_name()
 
     success, reason = import_dashboard(dashboard, remote_app=remote_app, name=name)
diff --git a/src/tests/functional/tests/test_grafana.py b/src/tests/functional/tests/test_grafana.py
index 66caa81..83dc8ad 100644
--- a/src/tests/functional/tests/test_grafana.py
+++ b/src/tests/functional/tests/test_grafana.py
@@ -81,30 +81,26 @@ class BaseGrafanaTest(unittest.TestCase):
         time.sleep(65)
         backupdir = model.run_on_unit(
             self.lead_unit_name,
-            "ls {directory}".format(
-                directory=DEFAULT_BACKUP_DIRECTORY
-            )
+            "ls {directory}".format(directory=DEFAULT_BACKUP_DIRECTORY),
         )
-        self.assertTrue("No such file or directory" not in backupdir['Stderr'])
+        self.assertTrue("No such file or directory" not in backupdir["Stderr"])
         backups_start = model.run_on_unit(
             self.lead_unit_name,
             "ls {project}/{backup}".format(
-                project=DEFAULT_BACKUP_DIRECTORY,
-                backup=backupdir['Stdout'].strip()
-            )
+                project=DEFAULT_BACKUP_DIRECTORY, backup=backupdir["Stdout"].strip()
+            ),
         )
-        self.assertTrue(".json" in backups_start['Stdout'])
-        number_of_backups_start = backups_start['Stdout'].count('.json')
+        self.assertTrue(".json" in backups_start["Stdout"])
+        number_of_backups_start = backups_start["Stdout"].count(".json")
         self.assertTrue(number_of_backups_start >= 1)
         time.sleep(65)
         backups_end = model.run_on_unit(
             self.lead_unit_name,
             "ls {project}/{backup}".format(
-                project=DEFAULT_BACKUP_DIRECTORY,
-                backup=backupdir['Stdout'].strip()
-            )
+                project=DEFAULT_BACKUP_DIRECTORY, backup=backupdir["Stdout"].strip()
+            ),
         )
-        number_of_backups_end = backups_end['Stdout'].count('.json')
+        number_of_backups_end = backups_end["Stdout"].count(".json")
         self.assertTrue(number_of_backups_end > number_of_backups_start)
 
 
@@ -236,8 +232,8 @@ class CharmOperationTest(BaseGrafanaTest):
             self.lead_unit_name,
             "cat /etc/cron.d/juju-dashboards-backup",
         )
-        self.assertTrue(DEFAULT_BACKUP_DIRECTORY in crontab['Stdout'])
-        self.assertTrue(DEFAULT_API_PORT in crontab['Stdout'])
+        self.assertTrue(DEFAULT_BACKUP_DIRECTORY in crontab["Stdout"])
+        self.assertTrue(DEFAULT_API_PORT in crontab["Stdout"])
         self.verify_iterative_backups()
 
     def test_14_grafana_dashboard_backup_port_change(self):
@@ -247,16 +243,15 @@ class CharmOperationTest(BaseGrafanaTest):
             self.application_name, {"dashboards_backup_schedule": "* * * * *"}
         )
         model.block_until_all_units_idle()
-        model.set_application_config(
-            self.application_name, {"port": port}
-        )
+        model.set_application_config(self.application_name, {"port": port})
         model.block_until_all_units_idle()
         crontab = model.run_on_unit(
             self.lead_unit_name, "cat /etc/cron.d/juju-dashboards-backup"
         )
-        self.assertTrue(port in crontab['Stdout'])
+        self.assertTrue(port in crontab["Stdout"])
         self.verify_iterative_backups()
 
+
 class SnappedGrafanaTest(BaseGrafanaTest):
     """Verify Grafana installed as a snap."""