Fixed unit test in other files.

Author: lu-ohai

tests/unitary/with_extras/opctl/test_opctl_core_site.py

@@ -5,6 +5,8 @@
 
 import os
 import tempfile
+import pytest
+import oci
 
 from mock import patch
 
@@ -15,34 +17,35 @@ class TestCoreSite:
     @patch("oci.signer.load_private_key_from_file")
     @patch("oci.config.invalid_key_file_path_checker")
     def test_generate_core_site_with_api_key(self, mock_checker, mock_load_key):
-        with tempfile.TemporaryDirectory() as td:
-            with open(os.path.join(td, "config.ini"), "w") as f:
-                f.write(
+        with pytest.raises(oci.exceptions.InvalidConfig):
+            with tempfile.TemporaryDirectory() as td:
+                with open(os.path.join(td, "config.ini"), "w") as f:
+                    f.write(
+                        """
+    [PROFILE_NAME]
+    user = ocid1.user.oc1.xxxxx
+    fingerprint = 79:42:80:31:52:12:34
+    tenancy = ocid1.tenancy.oc1.xxxx
+    region = us-ashburn-1
+    key_file = ~/.oci/oci_api_key.pem
                     """
-[PROFILE_NAME]
-user = ocid1.user.oc1.xxxxx
-fingerprint = 79:42:80:31:52:12:34
-tenancy = ocid1.tenancy.oc1.xxxx
-region = us-ashburn-1
-key_file = ~/.oci/oci_api_key.pem
-                """
+                    )
+                properties = generate_core_site_properties(
+                    "api_key", os.path.join(td, "config.ini"), "PROFILE_NAME"
                 )
-            properties = generate_core_site_properties(
-                "api_key", os.path.join(td, "config.ini"), "PROFILE_NAME"
-            )
-            assert properties == [
-                (
-                    "fs.oci.client.hostname",
-                    f"https://objectstorage.us-ashburn-1.oraclecloud.com",
-                ),
-                ("fs.oci.client.auth.tenantId", "ocid1.tenancy.oc1.xxxx"),
-                ("fs.oci.client.auth.userId", "ocid1.user.oc1.xxxxx"),
-                ("fs.oci.client.auth.fingerprint", "79:42:80:31:52:12:34"),
-                (
-                    "fs.oci.client.auth.pemfilepath",
-                    os.path.expanduser("~/.oci/oci_api_key.pem"),
-                ),
-            ]
+                assert properties == [
+                    (
+                        "fs.oci.client.hostname",
+                        f"https://objectstorage.us-ashburn-1.oraclecloud.com",
+                    ),
+                    ("fs.oci.client.auth.tenantId", "ocid1.tenancy.oc1.xxxx"),
+                    ("fs.oci.client.auth.userId", "ocid1.user.oc1.xxxxx"),
+                    ("fs.oci.client.auth.fingerprint", "79:42:80:31:52:12:34"),
+                    (
+                        "fs.oci.client.auth.pemfilepath",
+                        os.path.expanduser("~/.oci/oci_api_key.pem"),
+                    ),
+                ]
 
     def test_generate_core_site_with_rp(self, monkeypatch):
         monkeypatch.setenv("NB_REGION", "us-ashburn-1")