T2117: Cloud-init updated to 22.1

Merged with 22.1 tag from the upstream Cloud-init repository.

Our modules were slightly modified for compatibility with the new
version.

1 files changed, 7 insertions, 9 deletions

diff --git a/tests/integration_tests/modules/test_ssh_generate.py b/tests/integration_tests/modules/test_ssh_generate.py
index 60c36982..1dd0adf1 100644
--- a/tests/integration_tests/modules/test_ssh_generate.py
+++ b/tests/integration_tests/modules/test_ssh_generate.py
@@ -10,7 +10,6 @@ keys were created.
 
 import pytest
 
-
 USER_DATA = """\
 #cloud-config
 ssh_genkeytypes:
@@ -23,28 +22,27 @@ authkey_hash: sha512
 @pytest.mark.ci
 @pytest.mark.user_data(USER_DATA)
 class TestSshKeysGenerate:
-
     @pytest.mark.parametrize(
-        "ssh_key_path", (
+        "ssh_key_path",
+        (
             "/etc/ssh/ssh_host_dsa_key.pub",
             "/etc/ssh/ssh_host_dsa_key",
             "/etc/ssh/ssh_host_rsa_key.pub",
             "/etc/ssh/ssh_host_rsa_key",
-        )
+        ),
     )
     def test_ssh_keys_not_generated(self, ssh_key_path, class_client):
-        out = class_client.execute(
-            "test -e {}".format(ssh_key_path)
-        )
+        out = class_client.execute("test -e {}".format(ssh_key_path))
         assert out.failed
 
     @pytest.mark.parametrize(
-        "ssh_key_path", (
+        "ssh_key_path",
+        (
             "/etc/ssh/ssh_host_ecdsa_key.pub",
             "/etc/ssh/ssh_host_ecdsa_key",
             "/etc/ssh/ssh_host_ed25519_key.pub",
             "/etc/ssh/ssh_host_ed25519_key",
-        )
+        ),
     )
     def test_ssh_keys_generated(self, ssh_key_path, class_client):
         out = class_client.read_from_file(ssh_key_path)