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

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

1 files changed, 56 insertions, 47 deletions

diff --git a/tests/unittests/test_gpg.py b/tests/unittests/test_gpg.py
index ceada49a..c3772e3f 100644
--- a/tests/unittests/test_gpg.py
+++ b/tests/unittests/test_gpg.py
@@ -1,12 +1,11 @@
-import pytest
 from unittest import mock
 
-from cloudinit import gpg
-from cloudinit import subp
+import pytest
 
+from cloudinit import gpg, subp
 from tests.unittests.helpers import CiTestCase
 
-TEST_KEY_HUMAN = '''
+TEST_KEY_HUMAN = """
 /etc/apt/cloud-init.gpg.d/my_key.gpg
 --------------------------------------------
 pub   rsa4096 2021-10-22 [SC]
@@ -14,9 +13,9 @@ pub   rsa4096 2021-10-22 [SC]
 uid           [ unknown] Brett Holman <brett.holman@canonical.com>
 sub   rsa4096 2021-10-22 [A]
 sub   rsa4096 2021-10-22 [E]
-'''
+"""
 
-TEST_KEY_MACHINE = '''
+TEST_KEY_MACHINE = """
 tru::1:1635129362:0:3:1:5
 pub:-:4096:1:F83F77129A5EBD85:1634912922:::-:::scESCA::::::23::0:
 fpr:::::::::3A3EF34DFDEDB3B7F3FDF603F83F77129A5EBD85:
@@ -26,13 +25,13 @@ sub:-:4096:1:544B39C9A9141F04:1634912922::::::a::::::23:
 fpr:::::::::8BD901490D6EC986D03D6F0D544B39C9A9141F04:
 sub:-:4096:1:F45D9443F0A87092:1634912922::::::e::::::23:
 fpr:::::::::8CCCB332317324F030A45B19F45D9443F0A87092:
-'''
+"""
 
-TEST_KEY_FINGERPRINT_HUMAN = \
-    '3A3E F34D FDED B3B7 F3FD  F603 F83F 7712 9A5E BD85'
+TEST_KEY_FINGERPRINT_HUMAN = (
+    "3A3E F34D FDED B3B7 F3FD  F603 F83F 7712 9A5E BD85"
+)
 
-TEST_KEY_FINGERPRINT_MACHINE = \
-    '3A3EF34DFDEDB3B7F3FDF603F83F77129A5EBD85'
+TEST_KEY_FINGERPRINT_MACHINE = "3A3EF34DFDEDB3B7F3FDF603F83F77129A5EBD85"
 
 
 class TestGPGCommands:
@@ -41,45 +40,45 @@ class TestGPGCommands:
         internally.
         """
         with mock.patch.object(
-                subp,
-                'subp',
-                side_effect=subp.ProcessExecutionError):
+            subp, "subp", side_effect=subp.ProcessExecutionError
+        ):
             with pytest.raises(subp.ProcessExecutionError):
-                gpg.dearmor('garbage key value')
+                gpg.dearmor("garbage key value")
 
     def test_gpg_list_args(self):
-        """Verify correct command gets called to list keys
-        """
+        """Verify correct command gets called to list keys"""
         no_colons = [
-            'gpg',
-            '--with-fingerprint',
-            '--no-default-keyring',
-            '--list-keys',
-            '--keyring',
-            'key']
+            "gpg",
+            "--with-fingerprint",
+            "--no-default-keyring",
+            "--list-keys",
+            "--keyring",
+            "key",
+        ]
         colons = [
-            'gpg',
-            '--with-fingerprint',
-            '--no-default-keyring',
-            '--list-keys',
-            '--keyring',
-            '--with-colons',
-            'key']
-        with mock.patch.object(subp, 'subp', return_value=('', '')) as m_subp:
-            gpg.list('key')
+            "gpg",
+            "--with-fingerprint",
+            "--no-default-keyring",
+            "--list-keys",
+            "--keyring",
+            "--with-colons",
+            "key",
+        ]
+        with mock.patch.object(subp, "subp", return_value=("", "")) as m_subp:
+            gpg.list("key")
             assert mock.call(colons, capture=True) == m_subp.call_args
 
-            gpg.list('key', human_output=True)
+            gpg.list("key", human_output=True)
             test_calls = mock.call((no_colons), capture=True)
             assert test_calls == m_subp.call_args
 
     def test_gpg_dearmor_args(self):
-        """Verify correct command gets called to dearmor keys
-        """
-        with mock.patch.object(subp, 'subp', return_value=('', '')) as m_subp:
-            gpg.dearmor('key')
+        """Verify correct command gets called to dearmor keys"""
+        with mock.patch.object(subp, "subp", return_value=("", "")) as m_subp:
+            gpg.dearmor("key")
             test_call = mock.call(
-                ["gpg", "--dearmor"], data='key', decode=False)
+                ["gpg", "--dearmor"], data="key", decode=False
+            )
             assert test_call == m_subp.call_args
 
     @mock.patch("cloudinit.gpg.time.sleep")
@@ -91,18 +90,21 @@ class TestGPGCommands:
             """retry should be done on gpg receive keys failure."""
             retries = (1, 2, 4)
             my_exc = subp.ProcessExecutionError(
-                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
-            m_subp.side_effect = (my_exc, my_exc, ('', ''))
+                stdout="", stderr="", exit_code=2, cmd=["mycmd"]
+            )
+            m_subp.side_effect = (my_exc, my_exc, ("", ""))
             gpg.recv_key("ABCD", "keyserver.example.com", retries=retries)
             self.assertEqual(
-                [mock.call(1), mock.call(2)], m_sleep.call_args_list)
+                [mock.call(1), mock.call(2)], m_sleep.call_args_list
+            )
 
         def test_raises_error_after_retries(self, m_subp, m_sleep):
             """If the final run fails, error should be raised."""
             naplen = 1
             keyid, keyserver = ("ABCD", "keyserver.example.com")
             m_subp.side_effect = subp.ProcessExecutionError(
-                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
+                stdout="", stderr="", exit_code=2, cmd=["mycmd"]
+            )
             with self.assertRaises(ValueError) as rcm:
                 gpg.recv_key(keyid, keyserver, retries=(naplen,))
             self.assertIn(keyid, str(rcm.exception))
@@ -112,7 +114,8 @@ class TestGPGCommands:
         def test_no_retries_on_none(self, m_subp, m_sleep):
             """retry should not be done if retries is None."""
             m_subp.side_effect = subp.ProcessExecutionError(
-                stdout='', stderr='', exit_code=2, cmd=['mycmd'])
+                stdout="", stderr="", exit_code=2, cmd=["mycmd"]
+            )
             with self.assertRaises(ValueError):
                 gpg.recv_key("ABCD", "keyserver.example.com", retries=None)
             m_sleep.assert_not_called()
@@ -121,10 +124,16 @@ class TestGPGCommands:
             """Verify gpg is called with expected args."""
             key, keyserver = ("DEADBEEF", "keyserver.example.com")
             retries = (1, 2, 4)
-            m_subp.return_value = ('', '')
+            m_subp.return_value = ("", "")
             gpg.recv_key(key, keyserver, retries=retries)
             m_subp.assert_called_once_with(
-                ['gpg', '--no-tty',
-                 '--keyserver=%s' % keyserver, '--recv-keys', key],
-                capture=True)
+                [
+                    "gpg",
+                    "--no-tty",
+                    "--keyserver=%s" % keyserver,
+                    "--recv-keys",
+                    key,
+                ],
+                capture=True,
+            )
             m_sleep.assert_not_called()