test: fix make splunk home

Author: sgoral-splunk

tests/integration/context.py

@@ -43,4 +43,10 @@ def simple_requests(url, *args, **kwargs):
 
         return simpleRequest(url, *args, **kwargs)
 
+    def make_splunkn_home(url, *args, **kwargs):
+        from splunk.clilib.bundle_paths import make_splunkhome_path
+
+        return make_splunkhome_path(url, *args, **kwargs)
+
     monkeypatch.setattr("solnlib.splunkenv.simpleRequest", simple_requests)
+    monkeypatch.setattr("solnlib.splunkenv.msp", make_splunkn_home)

tests/integration/test_conf_manager.py

@@ -177,7 +177,9 @@ def test_get_log_level_incorrect_log_level_field(monkeypatch):
     assert expected_log_level == log_level
 
 
-def test_get_proxy_dict():
+def test_get_proxy_dict(monkeypatch):
+    context.mock_splunk(monkeypatch)
+
     session_key = context.get_session_key()
     expected_proxy_dict = VALID_PROXY_DICT
     proxy_dict = conf_manager.get_proxy_dict(
@@ -189,7 +191,9 @@ def test_get_proxy_dict():
     assert expected_proxy_dict == proxy_dict
 
 
-def test_invalid_proxy_port():
+def test_invalid_proxy_port(monkeypatch):
+    context.mock_splunk(monkeypatch)
+
     session_key = context.get_session_key()
 
     with pytest.raises(soln_exceptions.InvalidPortError):
@@ -203,7 +207,9 @@ def test_invalid_proxy_port():
         )
 
 
-def test_invalid_proxy_host():
+def test_invalid_proxy_host(monkeypatch):
+    context.mock_splunk(monkeypatch)
+
     session_key = context.get_session_key()
 
     with pytest.raises(soln_exceptions.InvalidHostnameError):
@@ -229,7 +235,9 @@ def test_conf_manager_exception():
         )
 
 
-def test_conf_stanza_not_exist_exception():
+def test_conf_stanza_not_exist_exception(monkeypatch):
+    context.mock_splunk(monkeypatch)
+
     session_key = context.get_session_key()
 
     with pytest.raises(soln_exceptions.ConfStanzaNotExistException):

tests/integration/test_splunkenv.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+import context
 import os
 import os.path as op
 import sys
@@ -22,13 +23,17 @@
 sys.path.insert(0, op.dirname(op.dirname(op.abspath(__file__))))
 
 
-def test_splunkenv():
+def test_splunkenv(monkeypatch):
+    context.mock_splunk(monkeypatch)
+
     assert "SPLUNK_HOME" in os.environ
 
+    sk = context.get_session_key()
+
     splunkhome_path = splunkenv.make_splunkhome_path(["etc", "apps"])
     assert splunkhome_path == op.join(os.environ["SPLUNK_HOME"], "etc", "apps")
 
-    server_name, host_name = splunkenv.get_splunk_host_info()
+    server_name, host_name = splunkenv.get_splunk_host_info(sk)
     assert server_name
     assert host_name
 
@@ -38,10 +43,10 @@ def test_splunkenv():
         op.join(os.environ["SPLUNK_HOME"], "bin", "splunk.exe"),
     ]
 
-    scheme, host, port = splunkenv.get_splunkd_access_info()
+    scheme, host, port = splunkenv.get_splunkd_access_info(sk)
     assert scheme
     assert host
     assert port
 
-    uri = splunkenv.get_splunkd_uri()
+    uri = splunkenv.get_splunkd_uri(sk)
     assert uri == f"{scheme}://{host}:{port}"