summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerena Feng <feng.xiaowei@zte.com.cn>2017-09-05 02:00:33 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-05 02:00:33 +0000
commit0c7bc1c58ce45b5c19a1c4f1a757363efe819a49 (patch)
treefd39b179dc0fe0a962773fc88d97f52d11656b9b
parent444ec6314f41400bb4e1cb8dfd65f66083cb794e (diff)
parenta69dbc8aa8a838f55629d8c6bd2372268f9dce41 (diff)
Merge "improve: discard venv support for official product"
-rw-r--r--utils/test/testapi/opnfv_testapi/common/config.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/utils/test/testapi/opnfv_testapi/common/config.py b/utils/test/testapi/opnfv_testapi/common/config.py
index 4cd53c619..ecfffd8dc 100644
--- a/utils/test/testapi/opnfv_testapi/common/config.py
+++ b/utils/test/testapi/opnfv_testapi/common/config.py
@@ -16,7 +16,7 @@ import sys
class Config(object):
def __init__(self):
- self.config_file = None
+ self.config_file = '/etc/opnfv_testapi/config.ini'
self._set_config_file()
self._parse()
self._parse_per_page()
@@ -56,23 +56,12 @@ class Config(object):
return value
def _set_config_file(self):
- if not self._set_sys_config_file():
- self._set_default_config_file()
-
- def _set_sys_config_file(self):
parser = argparse.ArgumentParser()
parser.add_argument("-c", "--config-file", dest='config_file',
help="Config file location", metavar="FILE")
args, _ = parser.parse_known_args(sys.argv)
- try:
+ if hasattr(args, 'config_file'):
self.config_file = args.config_file
- finally:
- return self.config_file is not None
-
- def _set_default_config_file(self):
- is_venv = os.getenv('VIRTUAL_ENV')
- self.config_file = os.path.join('/' if not is_venv else is_venv,
- 'etc/opnfv_testapi/config.ini')
CONF = Config()