Merge ~hloeung/apt-stresstest-charm:cleanup into apt-stresstest-charm:master

[Haw Loeung]

black-ify

black-ify

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

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

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

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

[Thomas Cuthbert (tcuthbert)]

LGTM but maybe rebase it so there is only the blackify commit in the MP.

review: Approve

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

Change has no commit message, setting status to needs review.

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

Change successfully merged at revision a0b8213d82085dc9671068e3e145518b7e156be1

diff --git a/files/test_apt_mirrors.py b/files/test_apt_mirrors.py
index 0497910..043c4e4 100755
--- a/files/test_apt_mirrors.py
+++ b/files/test_apt_mirrors.py
@@ -37,6 +37,7 @@ log = logging.getLogger('apt-stresstest')
 log.setLevel(logging.INFO)
 log.addHandler(file_handler)
 
+
 class Timer(object):
     def __init__(self):
         self._timer = None
@@ -60,28 +61,34 @@ def devnull():
 def parse_args():
     parser = argparse.ArgumentParser()
 
-    parser.add_argument('-v', '--verbose', help="increase output verbosity.",
-                        action="store_true")
+    parser.add_argument('-v', '--verbose', help="increase output verbosity.", action="store_true")
 
-    parser.add_argument('-p', "--package", help="package to download from repositories.",
-                        default="bash")
+    parser.add_argument('-p', "--package", help="package to download from repositories.", default="bash")
 
-    parser.add_argument('-f', "--hosts-file", help="local path for chrooted /etc/hosts configuration file.",
-                        default=None)
+    parser.add_argument(
+        '-f', "--hosts-file", help="local path for chrooted /etc/hosts configuration file.", default=None
+    )
 
-    parser.add_argument('-s', '--send-to', help="where to write the output, e.g. 127.0.0.1:8094",
-                        default=None)
+    parser.add_argument('-s', '--send-to', help="where to write the output, e.g. 127.0.0.1:8094", default=None)
 
-    parser.add_argument('--update-timeout', default=20, type=int,
-                        help="apt-get update timeout in seconds. If exceeded metric value will be set to 0",
-                        )
+    parser.add_argument(
+        '--update-timeout',
+        default=20,
+        type=int,
+        help="apt-get update timeout in seconds. If exceeded metric value will be set to 0",
+    )
 
-    parser.add_argument('--download-timeout', default=120, type=int,
-                        help="apt-get download timeout in seconds. If exceeded metric value will be set to 0",
-                        )
-    parser.add_argument('--series', type=int,
-                        help="Default Ubuntu release/series to test",
-                        )
+    parser.add_argument(
+        '--download-timeout',
+        default=120,
+        type=int,
+        help="apt-get download timeout in seconds. If exceeded metric value will be set to 0",
+    )
+    parser.add_argument(
+        '--series',
+        type=int,
+        help="Default Ubuntu release/series to test",
+    )
 
     return parser.parse_args()
 
@@ -151,13 +158,7 @@ def run(cmd, stderr=None, timeout=120):
 
 def render_influx(test, domain, ip, value, metric_name="apt_transaction_duration_seconds"):
     line_fmt = "{metric_name},test={test},mirror={domain},ip={ip} value={value}"
-    return line_fmt.format(
-        metric_name=metric_name,
-        test=test,
-        domain=domain,
-        ip=ip,
-        value=value
-    )
+    return line_fmt.format(metric_name=metric_name, test=test, domain=domain, ip=ip, value=value)
 
 
 def send_to_influx(send_to, metrics):
@@ -181,24 +182,34 @@ def output_results(result, verbose=False, send_to=None):
 def run_tests(domain, ip, packages, args):
 
     log.info("Running apt update 1 and sending to telegraf")
-    output_results(render_influx("update_1", domain, ip,
-                   apt_update(ip, timeout=args.update_timeout)),
-                   verbose=args.verbose, send_to=args.send_to)
+    output_results(
+        render_influx("update_1", domain, ip, apt_update(ip, timeout=args.update_timeout)),
+        verbose=args.verbose,
+        send_to=args.send_to,
+    )
     log.info("Running apt update 2 and sending to telegraf")
-    output_results(render_influx("update_2", domain, ip,
-                   apt_update(ip, timeout=args.update_timeout)),
-                   verbose=args.verbose, send_to=args.send_to)
+    output_results(
+        render_influx("update_2", domain, ip, apt_update(ip, timeout=args.update_timeout)),
+        verbose=args.verbose,
+        send_to=args.send_to,
+    )
     for index, package in enumerate(packages):
         log.info("Performing cached download of {} - {} and sending to telegraf".format(1 + index, package))
         test_name = "cached_download_{}_{}".format(1 + index, package)
-        output_results(render_influx(test_name, domain, ip,
-                       apt_download(package, ip, timeout=args.download_timeout)),
-                       verbose=args.verbose, send_to=args.send_to)
+        output_results(
+            render_influx(test_name, domain, ip, apt_download(package, ip, timeout=args.download_timeout)),
+            verbose=args.verbose,
+            send_to=args.send_to,
+        )
         log.info("Performing uncached download of {} - {} and sending to telegraf".format(1 + index, package))
         test_name = "uncached_download_{}_{}".format(1 + index, package)
-        output_results(render_influx(test_name, domain, ip,
-                       apt_download(package, ip, no_cache=True, timeout=args.download_timeout)),
-                       verbose=args.verbose, send_to=args.send_to)
+        output_results(
+            render_influx(
+                test_name, domain, ip, apt_download(package, ip, no_cache=True, timeout=args.download_timeout)
+            ),
+            verbose=args.verbose,
+            send_to=args.send_to,
+        )
 
 
 def get_apt_config_path(ip):
@@ -269,10 +280,16 @@ def main():
         )
     log.info("Tests done, stopping timer.")
     timer.stop()
-    output_results(render_influx("N/A", "N/A", "N/A", timer.time, "apt_transaction_total_duration_seconds"),
-                   verbose=args.verbose, send_to=args.send_to)
-    output_results(render_influx("N/A", "N/A", "N/A", len(ips), "apt_mirror_units_count"),
-                   verbose=args.verbose, send_to=args.send_to)
+    output_results(
+        render_influx("N/A", "N/A", "N/A", timer.time, "apt_transaction_total_duration_seconds"),
+        verbose=args.verbose,
+        send_to=args.send_to,
+    )
+    output_results(
+        render_influx("N/A", "N/A", "N/A", len(ips), "apt_mirror_units_count"),
+        verbose=args.verbose,
+        send_to=args.send_to,
+    )
     log.info("Pushed global timer and units count to telegraf.")
 
 
diff --git a/hooks/relations/telegraf-exec/provides.py b/hooks/relations/telegraf-exec/provides.py
index ea5de4b..405b1ce 100644
--- a/hooks/relations/telegraf-exec/provides.py
+++ b/hooks/relations/telegraf-exec/provides.py
@@ -35,11 +35,7 @@ class ExecProvides(RelationBase):
             conversation.remove_state('{relation_name}.available')
 
     def set_command(self, cmds, timeout, data_fmt):
-        config = json.dumps([{
-            'commands': cmds,
-            'timeout': timeout,
-            'data_format': data_fmt
-        }])
+        config = json.dumps([{'commands': cmds, 'timeout': timeout, 'data_format': data_fmt}])
 
         for conversation in self.conversations():
             conversation.set_remote(key="commands", value=config)
diff --git a/reactive/apt_stresstest.py b/reactive/apt_stresstest.py
index 6ab6884..6b5f548 100644
--- a/reactive/apt_stresstest.py
+++ b/reactive/apt_stresstest.py
@@ -64,10 +64,7 @@ def install_script():
     if os.path.exists('/usr/local/bin/test_apt_mirrors.py'):
         os.remove('/usr/local/bin/test_apt_mirrors.py')
 
-    shutil.copy(
-        os.path.join(charm_dir, 'files/test_apt_mirrors.py'),
-        '/usr/local/bin/test_apt_mirrors.py'
-    )
+    shutil.copy(os.path.join(charm_dir, 'files/test_apt_mirrors.py'), '/usr/local/bin/test_apt_mirrors.py')
 
 
 def install_crontab():
@@ -77,7 +74,7 @@ def install_crontab():
         content=APT_STRESSTEST_CRONTAB_TEMPLATE.format(
             args=stress_test_args(),
             stresstest_timeout=config.get('stresstest-timeout'),
-        ).encode('utf-8')
+        ).encode('utf-8'),
     )
 
 
@@ -109,7 +106,7 @@ def reconfigure():
     'apt.installed.run-one',
     'apt.installed.schroot',
     'apt.installed.simplestreams',
-    'apt.installed.ubuntu-cloudimage-keyring'
+    'apt.installed.ubuntu-cloudimage-keyring',
 )
 @when_not('exec.available')
 def status_wait_for_telegraf():
@@ -123,7 +120,7 @@ def status_wait_for_telegraf():
     'apt.installed.schroot',
     'apt.installed.simplestreams',
     'apt.installed.ubuntu-cloudimage-keyring',
-    'exec.available'
+    'exec.available',
 )
 @when_not('apt-stresstest.installed')
 def install_apt_stresstest(exec_relation):