- Fixing file paths to work from the project root instead of the tests folder

Author: rvelaVenafi

tests/test_pm.py

@@ -28,8 +28,9 @@
                           PolicySpecification)
 from vcert.policy.pm_cloud import CA_TYPE_DIGICERT, CA_TYPE_ENTRUST
 
-POLICY_SPEC_JSON = 'resources/policy_specification.json'
-POLICY_SPEC_YAML = 'resources/policy_specification.yaml'
+# This values are loaded from the project root which is vcert-python, not tests folder
+POLICY_SPEC_JSON = './tests/resources/policy_specification.json'
+POLICY_SPEC_YAML = './tests/resources/policy_specification.yaml'
 CA_TYPE_TPP = 'TPP'
 
 log = logger.get_child("test-pm")
@@ -38,8 +39,8 @@
 class TestParsers(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         super(TestParsers, self).__init__(*args, **kwargs)
-        self.json_file = _resolve_resources_path(POLICY_SPEC_JSON)
-        self.yaml_file = _resolve_resources_path(POLICY_SPEC_YAML)
+        self.json_file = POLICY_SPEC_JSON
+        self.yaml_file = POLICY_SPEC_YAML
 
     def test_json_parsing(self):
         ps = json_parser.parse_file(self.json_file)
@@ -86,8 +87,8 @@ def __init__(self, *args, **kwargs):
         self.tpp_conn = TPPTokenConnection(url=TPP_TOKEN_URL, http_request_kwargs={'verify': "/tmp/chain.pem"})
         auth = Authentication(user=TPP_USER, password=TPP_PASSWORD, scope=SCOPE_PM)
         self.tpp_conn.get_access_token(auth)
-        self.json_file = _resolve_resources_path(POLICY_SPEC_JSON)
-        self.yaml_file = _resolve_resources_path(POLICY_SPEC_YAML)
+        self.json_file = POLICY_SPEC_JSON
+        self.yaml_file = POLICY_SPEC_YAML
         super(TestTPPPolicyManagement, self).__init__(*args, **kwargs)
 
     def test_create_policy_from_json(self):
@@ -124,8 +125,8 @@ def _create_policy_tpp(self, policy_spec=None, policy=None, defaults=None):
 class TestCloudPolicyManagement(unittest.TestCase):
     def __init__(self, *args, **kwargs):
         self.cloud_conn = CloudConnection(token=CLOUD_APIKEY, url=CLOUD_URL)
-        self.json_file = _resolve_resources_path(POLICY_SPEC_JSON)
-        self.yaml_file = _resolve_resources_path(POLICY_SPEC_YAML)
+        self.json_file = POLICY_SPEC_JSON
+        self.yaml_file = POLICY_SPEC_YAML
         super(TestCloudPolicyManagement, self).__init__(*args, **kwargs)
 
     def test_create_policy_from_json(self):
@@ -262,10 +263,12 @@ def _get_tpp_policy_name():
     time = timestamp()
     return f"{_get_app_name().format(time)}"
 
-
-def _resolve_resources_path(path):
-    resources_dir = os.path.dirname(__file__)
-    log.debug(f"Testing root folder: [{resources_dir}]")
-    resolved_path = f"./{path}" if resources_dir.endswith('tests') else f"./tests/{path}"
-    log.debug(f"resolved path: [{resolved_path}]")
-    return resolved_path
+# def _resolve_resources_path(path):
+#     resources_dir = os.path.dirname(__file__)
+#     log.debug(f"Testing root folder: [{resources_dir}]")
+#     if resources_dir.endswith('tests'):
+#         resolved_path = f"./{path}"
+#     else:
+#         resolved_path = f"./tests/{path}"
+#     log.debug(f"resolved path: [{resolved_path}]")
+#     return resolved_path