Enable PYTHONPATH env variable inside the container

JIRA: FUNCTEST-224

Change-Id: Ib10dc312a761b06fe36174c5c19a0165f746593e
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

2 files changed, 4 insertions, 9 deletions

diff --git a/testcases/features/doctor.py b/testcases/features/doctor.py
index 0c1f713e..9ca6bf61 100644
--- a/testcases/features/doctor.py
+++ b/testcases/features/doctor.py
@@ -15,10 +15,10 @@
 #
 
 import logging
-import sys
 import time
 import yaml
 
+import functest_utils
 
 with open('/home/opnfv/functest/conf/config_functest.yaml') as f:
     functest_yaml = yaml.safe_load(f)
@@ -28,9 +28,6 @@ FUNCTEST_REPO = dirs.get('dir_repo_functest')
 DOCTOR_REPO = dirs.get('dir_repo_doctor')
 TEST_DB_URL = functest_yaml.get('results').get('test_db_url')
 
-sys.path.append('%s/testcases' % FUNCTEST_REPO)
-import functest_utils
-
 logger = logging.getLogger('doctor')
 logger.setLevel(logging.DEBUG)
 ch = logging.StreamHandler()
diff --git a/testcases/features/promise.py b/testcases/features/promise.py
index d501d676..04ca87a7 100644
--- a/testcases/features/promise.py
+++ b/testcases/features/promise.py
@@ -15,7 +15,6 @@ import logging
 import os
 import requests
 import subprocess
-import sys
 import yaml
 
 import keystoneclient.v2_0.client as ksclient
@@ -23,6 +22,9 @@ import glanceclient.client as glclient
 import novaclient.client as nvclient
 from neutronclient.v2_0 import client as ntclient
 
+import functest_utils
+import openstack_utils
+
 parser = argparse.ArgumentParser()
 
 parser.add_argument("-d", "--debug", help="Debug mode", action="store_true")
@@ -58,10 +60,6 @@ GLANCE_IMAGE_FORMAT = functest_yaml.get('general'). \
 GLANCE_IMAGE_PATH = functest_yaml.get('general'). \
     get('directories').get('dir_functest_data') + "/" + GLANCE_IMAGE_FILENAME
 
-sys.path.append('%s/testcases' % FUNCTEST_REPO)
-import functest_utils
-import openstack_utils
-
 """ logging configuration """
 logger = logging.getLogger('Promise')
 logger.setLevel(logging.DEBUG)