Adopt Black and isort (SC-700) (#1157)

Applied Black and isort, fixed any linting issues, updated tox.ini
and CI.

1 files changed, 66 insertions, 46 deletions

diff --git a/tests/unittests/config/test_cc_rsyslog.py b/tests/unittests/config/test_cc_rsyslog.py
index bc147dac..e5d06ca2 100644
--- a/tests/unittests/config/test_cc_rsyslog.py
+++ b/tests/unittests/config/test_cc_rsyslog.py
@@ -4,11 +4,16 @@ import os
 import shutil
 import tempfile
 
-from cloudinit.config.cc_rsyslog import (
-    apply_rsyslog_changes, DEF_DIR, DEF_FILENAME, DEF_RELOAD, load_config,
-    parse_remotes_line, remotes_to_rsyslog_cfg)
 from cloudinit import util
-
+from cloudinit.config.cc_rsyslog import (
+    DEF_DIR,
+    DEF_FILENAME,
+    DEF_RELOAD,
+    apply_rsyslog_changes,
+    load_config,
+    parse_remotes_line,
+    remotes_to_rsyslog_cfg,
+)
 from tests.unittests import helpers as t_help
 
 
@@ -16,43 +21,46 @@ class TestLoadConfig(t_help.TestCase):
     def setUp(self):
         super(TestLoadConfig, self).setUp()
         self.basecfg = {
-            'config_filename': DEF_FILENAME,
-            'config_dir': DEF_DIR,
-            'service_reload_command': DEF_RELOAD,
-            'configs': [],
-            'remotes': {},
+            "config_filename": DEF_FILENAME,
+            "config_dir": DEF_DIR,
+            "service_reload_command": DEF_RELOAD,
+            "configs": [],
+            "remotes": {},
         }
 
     def test_legacy_full(self):
-        found = load_config({
-            'rsyslog': ['*.* @192.168.1.1'],
-            'rsyslog_dir': "mydir",
-            'rsyslog_filename': "myfilename"})
-        self.basecfg.update({
-            'configs': ['*.* @192.168.1.1'],
-            'config_dir': "mydir",
-            'config_filename': 'myfilename',
-            'service_reload_command': 'auto'}
+        found = load_config(
+            {
+                "rsyslog": ["*.* @192.168.1.1"],
+                "rsyslog_dir": "mydir",
+                "rsyslog_filename": "myfilename",
+            }
+        )
+        self.basecfg.update(
+            {
+                "configs": ["*.* @192.168.1.1"],
+                "config_dir": "mydir",
+                "config_filename": "myfilename",
+                "service_reload_command": "auto",
+            }
         )
 
         self.assertEqual(found, self.basecfg)
 
     def test_legacy_defaults(self):
-        found = load_config({
-            'rsyslog': ['*.* @192.168.1.1']})
-        self.basecfg.update({
-            'configs': ['*.* @192.168.1.1']})
+        found = load_config({"rsyslog": ["*.* @192.168.1.1"]})
+        self.basecfg.update({"configs": ["*.* @192.168.1.1"]})
         self.assertEqual(found, self.basecfg)
 
     def test_new_defaults(self):
         self.assertEqual(load_config({}), self.basecfg)
 
     def test_new_configs(self):
-        cfgs = ['*.* myhost', '*.* my2host']
-        self.basecfg.update({'configs': cfgs})
+        cfgs = ["*.* myhost", "*.* my2host"]
+        self.basecfg.update({"configs": cfgs})
         self.assertEqual(
-            load_config({'rsyslog': {'configs': cfgs}}),
-            self.basecfg)
+            load_config({"rsyslog": {"configs": cfgs}}), self.basecfg
+        )
 
 
 class TestApplyChanges(t_help.TestCase):
@@ -63,27 +71,29 @@ class TestApplyChanges(t_help.TestCase):
     def test_simple(self):
         cfgline = "*.* foohost"
         changed = apply_rsyslog_changes(
-            configs=[cfgline], def_fname="foo.cfg", cfg_dir=self.tmp)
+            configs=[cfgline], def_fname="foo.cfg", cfg_dir=self.tmp
+        )
 
         fname = os.path.join(self.tmp, "foo.cfg")
         self.assertEqual([fname], changed)
-        self.assertEqual(
-            util.load_file(fname), cfgline + "\n")
+        self.assertEqual(util.load_file(fname), cfgline + "\n")
 
     def test_multiple_files(self):
         configs = [
-            '*.* foohost',
-            {'content': 'abc', 'filename': 'my.cfg'},
-            {'content': 'filefoo-content',
-             'filename': os.path.join(self.tmp, 'mydir/mycfg')},
+            "*.* foohost",
+            {"content": "abc", "filename": "my.cfg"},
+            {
+                "content": "filefoo-content",
+                "filename": os.path.join(self.tmp, "mydir/mycfg"),
+            },
         ]
 
         changed = apply_rsyslog_changes(
-            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp)
+            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp
+        )
 
         expected = [
-            (os.path.join(self.tmp, "default.cfg"),
-             "*.* foohost\n"),
+            (os.path.join(self.tmp, "default.cfg"), "*.* foohost\n"),
             (os.path.join(self.tmp, "my.cfg"), "abc\n"),
             (os.path.join(self.tmp, "mydir/mycfg"), "filefoo-content\n"),
         ]
@@ -91,30 +101,37 @@ class TestApplyChanges(t_help.TestCase):
         actual = []
         for fname, _content in expected:
             util.load_file(fname)
-            actual.append((fname, util.load_file(fname),))
+            actual.append(
+                (
+                    fname,
+                    util.load_file(fname),
+                )
+            )
         self.assertEqual(expected, actual)
 
     def test_repeat_def(self):
-        configs = ['*.* foohost', "*.warn otherhost"]
+        configs = ["*.* foohost", "*.warn otherhost"]
 
         changed = apply_rsyslog_changes(
-            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp)
+            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp
+        )
 
         fname = os.path.join(self.tmp, "default.cfg")
         self.assertEqual([fname], changed)
 
-        expected_content = '\n'.join([c for c in configs]) + '\n'
+        expected_content = "\n".join([c for c in configs]) + "\n"
         found_content = util.load_file(fname)
         self.assertEqual(expected_content, found_content)
 
     def test_multiline_content(self):
-        configs = ['line1', 'line2\nline3\n']
+        configs = ["line1", "line2\nline3\n"]
 
         apply_rsyslog_changes(
-            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp)
+            configs=configs, def_fname="default.cfg", cfg_dir=self.tmp
+        )
 
         fname = os.path.join(self.tmp, "default.cfg")
-        expected_content = '\n'.join([c for c in configs])
+        expected_content = "\n".join([c for c in configs])
         found_content = util.load_file(fname)
         self.assertEqual(expected_content, found_content)
 
@@ -152,7 +169,7 @@ class TestRemotesToSyslog(t_help.TestCase):
         # str rendered line must appear in remotes_to_ryslog_cfg return
         mycfg = "*.* myhost"
         myline = str(parse_remotes_line(mycfg, name="myname"))
-        r = remotes_to_rsyslog_cfg({'myname': mycfg})
+        r = remotes_to_rsyslog_cfg({"myname": mycfg})
         lines = r.splitlines()
         self.assertEqual(1, len(lines))
         self.assertTrue(myline in r.splitlines())
@@ -161,7 +178,8 @@ class TestRemotesToSyslog(t_help.TestCase):
         header = "#foo head"
         footer = "#foo foot"
         r = remotes_to_rsyslog_cfg(
-            {'myname': "*.* myhost"}, header=header, footer=footer)
+            {"myname": "*.* myhost"}, header=header, footer=footer
+        )
         lines = r.splitlines()
         self.assertTrue(header, lines[0])
         self.assertTrue(footer, lines[-1])
@@ -170,9 +188,11 @@ class TestRemotesToSyslog(t_help.TestCase):
         mycfg = "*.* myhost"
         myline = str(parse_remotes_line(mycfg, name="myname"))
         r = remotes_to_rsyslog_cfg(
-            {'myname': mycfg, 'removed': None, 'removed2': ""})
+            {"myname": mycfg, "removed": None, "removed2": ""}
+        )
         lines = r.splitlines()
         self.assertEqual(1, len(lines))
         self.assertTrue(myline in r.splitlines())
 
+
 # vi: ts=4 expandtab