From a3b79144c1f4360108ca62b3cc297387edb7eb61 Mon Sep 17 00:00:00 2001
From: "Daniel A. Wozniak" <daniel.wozniak@broadcom.com>
Date: Mon, 17 Feb 2025 15:44:26 -0700
Subject: [PATCH] Fix ssh and cmd mod tests

---
 .pylintrc                                       | 4 +++-
 salt/utils/thin.py                              | 9 +++++++++
 tests/pytests/functional/modules/test_cmdmod.py | 8 +++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/.pylintrc b/.pylintrc
index 1809ffc356d..122f99a9f1c 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -762,4 +762,6 @@ allowed-3rd-party-modules=msgpack,
                           cryptography,
                           aiohttp,
                           pytest_timeout,
-                          networkx
+                          networkx,
+                          urllib3,
+                          idna
diff --git a/salt/utils/thin.py b/salt/utils/thin.py
index 691f44076d1..9ff7548be65 100644
--- a/salt/utils/thin.py
+++ b/salt/utils/thin.py
@@ -20,12 +20,15 @@ import types
 import zipfile
 
 import distro
+import idna
 import jinja2
 import looseversion
 import msgpack
 import networkx
 import packaging
+import requests
 import tornado
+import urllib3
 import yaml
 
 import salt
@@ -282,6 +285,9 @@ def get_tops_python(py_ver, exclude=None, ext_py_ver=None):
         "tornado",
         "msgpack",
         "networkx",
+        "requests",
+        "idna",
+        "urllib3",
         "certifi",
         "singledispatch",
         "concurrent",
@@ -441,6 +447,9 @@ def get_tops(extra_mods="", so_mods=""):
         backports_abc,
         looseversion,
         packaging,
+        requests,
+        idna,
+        urllib3,
     ]
     modules = find_site_modules("contextvars")
     if modules:
diff --git a/tests/pytests/functional/modules/test_cmdmod.py b/tests/pytests/functional/modules/test_cmdmod.py
index f8dbb7e1134..e97a61ed09f 100644
--- a/tests/pytests/functional/modules/test_cmdmod.py
+++ b/tests/pytests/functional/modules/test_cmdmod.py
@@ -481,7 +481,13 @@ def test_runas(cmdmod, usermod, runas_usr):
     """
     Ensure that the env is the runas user's
     """
-    out = cmdmod.run("env", runas=runas_usr).splitlines()
+    # photon os sets the nobody user's home directory to /dev/null. This causes
+    # runas to fail because the /dev/null is not a directory.
+    cwd = None
+    if os.path.expanduser(f"~{runas_usr}") == "/dev/null":
+        cwd = "/"
+
+    out = cmdmod.run("env", runas=runas_usr, cwd=cwd).splitlines()
     assert f"USER={runas_usr}" in out