Remove file path hardcodes

Make tests runnable in IDE.

Change-Id: I9901c10c319687a10616f634fca25297cf84df3a
Issue-ID: VNFSDK-375
Signed-off-by: Zebek Bogumil <bogumil.zebek@nokia.com>

diff --git a/.gitignore b/.gitignore
index 7fab6b4..dee19fb 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,10 @@
+*.iml
 *.egg*
 *.pyc
 .coverage
 .tox
+.cache
+.idea
+build/
+xunit-results.xml
+coverage.xml

diff --git a/tests/packager/test_csar.py b/tests/packager/test_csar.py
index 04efca7..8217146 100644 (file)
--- a/tests/packager/test_csar.py
+++ b/tests/packager/test_csar.py
@@ -18,12 +18,15 @@ import filecmp
 import os
 import tempfile
 import shutil
-
 import pytest
 
 from vnfsdk_pkgtools.packager import csar
+from vnfsdk_pkgtools import util
+
+
+ROOT_DIR = util.get_project_root()
 
-CSAR_RESOURCE_DIR = 'tests/resources/csar'
+CSAR_RESOURCE_DIR = os.path.join(ROOT_DIR, 'tests', 'resources', 'csar')
 CSAR_ENTRY_FILE = 'test_entry.yaml'
 CSAR_OUTPUT_FILE = 'output.csar'
 
@@ -65,7 +68,7 @@ ARGS_MANIFEST_DIGEST_CERT = {
             'licenses': 'Licenses',
             'digest': 'sha256',
             'certificate': 'test.crt',
-            'privkey': 'tests/resources/signature/test.key',
+            'privkey': os.path.join(ROOT_DIR, 'tests', 'resources', 'signature', 'test.key')
         }
 
 ARGS_NO_MANIFEST = {

diff --git a/tests/packager/test_utils.py b/tests/packager/test_utils.py
index 3124ea5..2a2d98c 100644 (file)
--- a/tests/packager/test_utils.py
+++ b/tests/packager/test_utils.py
@@ -19,6 +19,14 @@ import subprocess
 import pytest
 
 from vnfsdk_pkgtools.packager import utils
+from vnfsdk_pkgtools import util
+
+ROOT_DIR = util.get_project_root()
+RESOURCES_DIR= os.path.join(ROOT_DIR, 'tests', 'resources', 'signature')
+
+MSG_FILE  = os.path.join(RESOURCES_DIR, 'manifest.mf')
+CERT_FILE = os.path.join(RESOURCES_DIR, 'test.crt')
+KEY_FILE  = os.path.join(RESOURCES_DIR, 'test.key')
 
 CONTENT = "needToBeHashed"
 SHA256 = "20a480339aa4371099f9503511dcc5a8051ce3884846678ced5611ec64bbfc9c"
@@ -38,11 +46,6 @@ def test_cal_file_hash_remote(mocker):
     mocker.patch('requests.get', new=FakeRequest)
     assert SHA256 == utils.cal_file_hash("", "http://fake", 'sha256')
 
-
-MSG_FILE  = "tests/resources/signature/manifest.mf"
-CERT_FILE = "tests/resources/signature/test.crt"
-KEY_FILE  = "tests/resources/signature/test.key"
-
 def test_sign_verify_pairwise():
     cms = utils.sign(MSG_FILE, CERT_FILE, KEY_FILE)
     # We can't examine the exact content of cms because it contains timestamp

diff --git a/tests/validator/test_toscaparser_validator.py b/tests/validator/test_toscaparser_validator.py
index 3348d60..12a293b 100644 (file)
--- a/tests/validator/test_toscaparser_validator.py
+++ b/tests/validator/test_toscaparser_validator.py
@@ -19,10 +19,14 @@ import pytest
 
 from vnfsdk_pkgtools.packager import csar
 from vnfsdk_pkgtools.validator import toscaparser_validator
+from vnfsdk_pkgtools import util
 
-CSAR_PATH = 'tests/resources/test_import.csar'
-HPA_PATH = 'tests/resources/hpa.csar'
-BAD_HPA_PATH = 'tests/resources/hpa_bad.csar'
+ROOT_DIR = util.get_project_root()
+RESOURCES_DIR = os.path.join(ROOT_DIR, 'tests', 'resources')
+
+CSAR_PATH = os.path.join(RESOURCES_DIR, 'test_import.csar')
+HPA_PATH = os.path.join(RESOURCES_DIR, 'hpa.csar')
+BAD_HPA_PATH = os.path.join(RESOURCES_DIR, 'hpa_bad.csar')
 
 def test_validate(tmpdir):
     reader = csar._CSARReader(CSAR_PATH, str(tmpdir.mkdir('validate')))

diff --git a/vnfsdk_pkgtools/util.py b/vnfsdk_pkgtools/util.py
new file mode 100644 (file)
index 0000000..78010e2
--- /dev/null
+++ b/vnfsdk_pkgtools/util.py
@@ -0,0 +1,8 @@
+import os
+
+import vnfsdk_pkgtools
+
+
+def get_project_root():
+    """Returns project root folder."""
+    return os.path.abspath(os.path.join(os.path.dirname(vnfsdk_pkgtools.__file__),os.pardir))