From 41a39417f8a6893f21c5c4f98606af78f04f9a19 Mon Sep 17 00:00:00 2001
From: Pedro Algarvio <palgarvio@vmware.com>
Date: Mon, 27 Mar 2023 11:55:41 +0100
Subject: [PATCH] Remaining test fixes regarding the recent GitHub RSA key
 change

Signed-off-by: Pedro Algarvio <palgarvio@vmware.com>
---
 tests/filename_map.yml                      |  5 +++++
 tests/integration/files/ssh/authorized_keys |  2 +-
 tests/integration/files/ssh/raw             |  1 -
 tests/integration/modules/test_ssh.py       | 12 ++++++------
 4 files changed, 12 insertions(+), 8 deletions(-)
 delete mode 100644 tests/integration/files/ssh/raw

diff --git a/tests/filename_map.yml b/tests/filename_map.yml
index 72527e08941..968e1f32195 100644
--- a/tests/filename_map.yml
+++ b/tests/filename_map.yml
@@ -337,3 +337,8 @@ tests/pytests/scenarios/multimaster:
   - pytests.scenarios.multimaster.beacons.test_inotify
   - pytests.scenarios.multimaster.modules.test_test
   - pytests.scenarios.failover.multimaster.test_failover_master
+
+tests/integration/files/ssh/.*:
+  - integration.modules.test_ssh
+  - integration.states.test_ssh_auth
+  - integration.states.test_ssh_known_hosts
diff --git a/tests/integration/files/ssh/authorized_keys b/tests/integration/files/ssh/authorized_keys
index 6e23c8561a0..ac8b7e20976 100644
--- a/tests/integration/files/ssh/authorized_keys
+++ b/tests/integration/files/ssh/authorized_keys
@@ -1 +1 @@
-command="/usr/local/lib/ssh-helper" ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ== github.com
+command="/usr/local/lib/ssh-helper" ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk= github.com
diff --git a/tests/integration/files/ssh/raw b/tests/integration/files/ssh/raw
deleted file mode 100644
index 3e58ba81e02..00000000000
--- a/tests/integration/files/ssh/raw
+++ /dev/null
@@ -1 +0,0 @@
-AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
diff --git a/tests/integration/modules/test_ssh.py b/tests/integration/modules/test_ssh.py
index ac0e0739564..0817877c86b 100644
--- a/tests/integration/modules/test_ssh.py
+++ b/tests/integration/modules/test_ssh.py
@@ -6,14 +6,14 @@ import os
 import shutil
 
 import pytest
+import requests
 
 import salt.utils.files
 import salt.utils.platform
-from salt.ext.tornado.httpclient import HTTPClient
 from tests.support.case import ModuleCase
 from tests.support.runtests import RUNTIME_VARS
 
-GITHUB_FINGERPRINT = "9d:38:5b:83:a9:17:52:92:56:1a:5e:c4:d4:81:8e:0a:ca:51:a2:64:f1:74:20:11:2e:f8:8a:c3:a1:39:49:8f"
+GITHUB_FINGERPRINT = "b8:d8:95:ce:d9:2c:0a:c0:e1:71:cd:2e:f5:ef:01:ba:34:17:55:4a:4a:64:80:d3:31:cc:c2:be:3d:ed:0f:6b"
 
 
 def check_status():
@@ -21,7 +21,7 @@ def check_status():
     Check the status of Github for remote operations
     """
     try:
-        return HTTPClient().fetch("http://github.com").code == 200
+        return requests.get("https://github.com").status_code == 200
     except Exception:  # pylint: disable=broad-except
         return False
 
@@ -49,9 +49,9 @@ class SSHModuleTest(ModuleCase):
         if not os.path.isdir(self.subsalt_dir):
             os.makedirs(self.subsalt_dir)
 
-        ssh_raw_path = os.path.join(RUNTIME_VARS.FILES, "ssh", "raw")
-        with salt.utils.files.fopen(ssh_raw_path) as fd:
-            self.key = fd.read().strip()
+        known_hosts_file = os.path.join(RUNTIME_VARS.FILES, "ssh", "known_hosts")
+        with salt.utils.files.fopen(known_hosts_file) as fd:
+            self.key = fd.read().strip().splitlines()[0].split()[-1]
 
     def tearDown(self):
         """