From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sun, 18 Jun 2017 07:10:19 +0000 (+0200)
Subject: Remove module references __file__
X-Git-Tag: 0.2~568
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=997969d3d79bcebf13aeae8763b2c9747df03702;p=functest-xtesting.git

Remove module references __file__

It allows functest to be run directly from a zip file [1].

[1] https://setuptools.readthedocs.io/en/latest/setuptools.html#setting-the-zip-safe-flag

Change-Id: I596a71e8cf2bed6dd79655bd5beeb047876a188c
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/tests/unit/utils/test_functest_utils.py b/functest/tests/unit/utils/test_functest_utils.py
index d84a3201..6f7976e4 100644
--- a/functest/tests/unit/utils/test_functest_utils.py
+++ b/functest/tests/unit/utils/test_functest_utils.py
@@ -8,6 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 
 import logging
+import pkg_resources
 import os
 import time
 import unittest
@@ -56,8 +57,8 @@ class FunctestUtilsTesting(unittest.TestCase):
         self.testcase_dict = {'case_name': 'testname',
                               'criteria': self.criteria}
         self.parameter = 'general.openstack.image_name'
-        self.config_yaml = os.path.normpath(os.path.join(os.path.dirname(
-            os.path.abspath(__file__)), '../../../ci/config_functest.yaml'))
+        self.config_yaml = pkg_resources.resource_filename(
+            'functest', 'ci/config_functest.yaml')
         self.db_url_env = 'http://foo/testdb'
         self.testcases_yaml = "test_testcases_yaml"
         self.file_yaml = {'general': {'openstack': {'image_name':
diff --git a/functest/utils/env.py b/functest/utils/env.py
index 3724ec99..0174588d 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+import pkg_resources
 import os
 import re
 
@@ -16,8 +17,8 @@ default_envs = {
     'BUILD_TAG': None,
     'OS_ENDPOINT_TYPE': None,
     'OS_AUTH_URL': None,
-    'CONFIG_FUNCTEST_YAML': os.path.normpath(os.path.join(os.path.dirname(
-        os.path.abspath(__file__)), '../ci/config_functest.yaml'))
+    'CONFIG_FUNCTEST_YAML': pkg_resources.resource_filename(
+        'functest', 'ci/config_functest.yaml')
 }