Updated unit test.

Author: lu-ohai

tests/unitary/default_setup/telemetry/test_agent.py

@@ -33,15 +33,15 @@ def setup_method(self):
     def teardown_method(self):
         self.test_config = {}
 
+    @patch("oci.config.validate_config")
     @patch("oci.signer.Signer")
-    def test_user_agent_api_keys_using_test_profile(self, mock_signer):
-        with pytest.raises(oci.exceptions.InvalidConfig):
-            with patch("oci.config.from_file", return_value=self.test_config):
-                auth_info = ads.auth.api_keys("test_path", "TEST_PROFILE")
-                assert (
-                    auth_info["config"].get("additional_user_agent")
-                    == f"{LIBRARY}/version={ads.__version__}#surface=WORKSTATION#api={UNKNOWN}"
-                )
+    def test_user_agent_api_keys_using_test_profile(self, mock_signer, mock_validate_config):
+        with patch("oci.config.from_file", return_value=self.test_config):
+            auth_info = ads.auth.api_keys("test_path", "TEST_PROFILE")
+            assert (
+                auth_info["config"].get("additional_user_agent")
+                == f"{LIBRARY}/version={ads.__version__}#surface=WORKSTATION#api={UNKNOWN}"
+            )
 
     @patch("oci.auth.signers.get_resource_principals_signer")
     def test_user_agent_rp(self, mock_signer, monkeypatch):
@@ -54,18 +54,18 @@ def test_user_agent_rp(self, mock_signer, monkeypatch):
             == f"{LIBRARY}/version={ads.__version__}#surface=WORKSTATION#api={UNKNOWN}"
         )
 
+    @patch("oci.config.validate_config")
     @patch("oci.signer.load_private_key_from_file")
-    def test_user_agent_default_signer(self, mock_load_key_file, monkeypatch):
-        with pytest.raises(oci.exceptions.InvalidConfig):
-            # monkeypatch = MonkeyPatch()
-            monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)
-            importlib.reload(ads.config)
-            with patch("oci.config.from_file", return_value=self.test_config):
-                auth_info = ads.auth.default_signer()
-                assert (
-                    auth_info["config"].get("additional_user_agent")
-                    == f"{LIBRARY}/version={ads.__version__}#surface=WORKSTATION#api={UNKNOWN}"
-                )
+    def test_user_agent_default_signer(self, mock_load_key_file, mock_validate_config, monkeypatch):
+        # monkeypatch = MonkeyPatch()
+        monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)
+        importlib.reload(ads.config)
+        with patch("oci.config.from_file", return_value=self.test_config):
+            auth_info = ads.auth.default_signer()
+            assert (
+                auth_info["config"].get("additional_user_agent")
+                == f"{LIBRARY}/version={ads.__version__}#surface=WORKSTATION#api={UNKNOWN}"
+            )
 
     @pytest.mark.parametrize(
         "INPUT_DATA, EXPECTED_RESULT",
@@ -103,48 +103,49 @@ def test_user_agent_default_signer(self, mock_load_key_file, monkeypatch):
             ),
         ],
     )
+    @patch("oci.config.validate_config")
     @patch("oci.signer.load_private_key_from_file")
     def test_user_agent_default_signer_known_resources(
-        self,mock_load_key_file, monkeypatch, INPUT_DATA, EXPECTED_RESULT
+        self,mock_load_key_file, mock_validate_config, monkeypatch, INPUT_DATA, EXPECTED_RESULT
     ):
-        with pytest.raises(oci.exceptions.InvalidConfig):
-            # monkeypatch = MonkeyPatch()
-            monkeypatch.setenv("OCI_RESOURCE_PRINCIPAL_VERSION", "1.1")
-            monkeypatch.setenv(INPUT_DATA["RESOURCE_KEY"], "1234")
-            if INPUT_DATA[EXTRA_USER_AGENT_INFO] is not None:
-                monkeypatch.setenv(EXTRA_USER_AGENT_INFO, INPUT_DATA[EXTRA_USER_AGENT_INFO])
-
-            importlib.reload(ads.config)
-            importlib.reload(ads)
-            importlib.reload(ads.auth)
-            importlib.reload(ads.telemetry)
-
-            with patch("oci.config.from_file", return_value=self.test_config):
-                auth_info = ads.auth.default_signer()
-                assert (
-                    auth_info["config"].get("additional_user_agent")
-                    == f"{LIBRARY}/version={ads.__version__}#surface={EXPECTED_RESULT['USER_AGENT_VALUE']}#api={EXPECTED_RESULT[EXTRA_USER_AGENT_INFO]}"
-                )
-            monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)
-            monkeypatch.delenv(INPUT_DATA["RESOURCE_KEY"], raising=False)
-            monkeypatch.delenv(EXTRA_USER_AGENT_INFO, raising=False)
+        # monkeypatch = MonkeyPatch()
+        monkeypatch.setenv("OCI_RESOURCE_PRINCIPAL_VERSION", "1.1")
+        monkeypatch.setenv(INPUT_DATA["RESOURCE_KEY"], "1234")
+        if INPUT_DATA[EXTRA_USER_AGENT_INFO] is not None:
+            monkeypatch.setenv(EXTRA_USER_AGENT_INFO, INPUT_DATA[EXTRA_USER_AGENT_INFO])
+
+        importlib.reload(ads.config)
+        importlib.reload(ads)
+        importlib.reload(ads.auth)
+        importlib.reload(ads.telemetry)
+
+        with patch("oci.config.from_file", return_value=self.test_config):
+            auth_info = ads.auth.default_signer()
+            assert (
+                auth_info["config"].get("additional_user_agent")
+                == f"{LIBRARY}/version={ads.__version__}#surface={EXPECTED_RESULT['USER_AGENT_VALUE']}#api={EXPECTED_RESULT[EXTRA_USER_AGENT_INFO]}"
+            )
+        monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)
+        monkeypatch.delenv(INPUT_DATA["RESOURCE_KEY"], raising=False)
+        monkeypatch.delenv(EXTRA_USER_AGENT_INFO, raising=False)
 
+    @patch("oci.config.validate_config")
     @patch("oci.signer.Signer")
     def test_user_agent_default_singer_ociservice(
         self,
         mock_signer,
-        monkeypatch
+        mock_validate_config,
+        monkeypatch,
     ):
-        with pytest.raises(oci.exceptions.InvalidConfig):
-            monkeypatch.setenv("OCI_RESOURCE_PRINCIPAL_VERSION", "1.1")
-
-            importlib.reload(ads.config)
-            importlib.reload(ads.telemetry)
-
-            with patch("oci.config.from_file", return_value=self.test_config):
-                auth_info = ads.auth.default_signer()
-                assert (
-                    auth_info["config"].get("additional_user_agent")
-                    == f"{LIBRARY}/version={ads.__version__}#surface=OCI_SERVICE#api={UNKNOWN}"
-                )
-            monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)
+        monkeypatch.setenv("OCI_RESOURCE_PRINCIPAL_VERSION", "1.1")
+
+        importlib.reload(ads.config)
+        importlib.reload(ads.telemetry)
+
+        with patch("oci.config.from_file", return_value=self.test_config):
+            auth_info = ads.auth.default_signer()
+            assert (
+                auth_info["config"].get("additional_user_agent")
+                == f"{LIBRARY}/version={ads.__version__}#surface=OCI_SERVICE#api={UNKNOWN}"
+            )
+        monkeypatch.delenv("OCI_RESOURCE_PRINCIPAL_VERSION", raising=False)