diff options
Diffstat (limited to 'functest/utils')
| -rw-r--r-- | functest/utils/config.py | 2 | ||||
| -rw-r--r-- | functest/utils/constants.py | 4 | ||||
| -rw-r--r-- | functest/utils/env.py | 8 |
3 files changed, 3 insertions, 11 deletions
diff --git a/functest/utils/config.py b/functest/utils/config.py index 050f12a9..c569856b 100644 --- a/functest/utils/config.py +++ b/functest/utils/config.py @@ -45,7 +45,7 @@ class Config(object): for param_n, param_v in six.iteritems(left_parametes): attr_further = self._get_attr_further(attr_now, param_n) if attr_further: - self.__setattr__(attr_further, param_v) + setattr(self, attr_further, param_v) if isinstance(param_v, dict): self._parse(attr_further, param_v) diff --git a/functest/utils/constants.py b/functest/utils/constants.py index cb3ea787..c19e0fc5 100644 --- a/functest/utils/constants.py +++ b/functest/utils/constants.py @@ -12,9 +12,9 @@ class Constants(object): # pylint: disable=too-few-public-methods def __init__(self): for attr_n, attr_v in six.iteritems(config.CONF.__dict__): - self.__setattr__(attr_n, attr_v) + setattr(self, attr_n, attr_v) for env_n, env_v in six.iteritems(env.ENV.__dict__): - self.__setattr__(env_n, env_v) + setattr(self, env_n, env_v) CONST = Constants() diff --git a/functest/utils/env.py b/functest/utils/env.py index f6e6e100..110164be 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -13,7 +13,6 @@ class Environment(object): # pylint: disable=too-few-public-methods default_envs = { 'NODE_NAME': 'unknown_pod', - 'CI_DEBUG': 'false', 'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha', 'DEPLOY_TYPE': 'virt', 'INSTALLER_TYPE': None, @@ -33,16 +32,9 @@ class Environment(object): # pylint: disable=too-few-public-methods for key, value in six.iteritems(self.default_envs): if key not in os.environ: setattr(self, key, value) - self._set_ci_run() if 'CI_LOOP' not in os.environ: self._set_ci_loop() - def _set_ci_run(self): - if getattr(self, "BUILD_TAG"): - setattr(self, "IS_CI_RUN", True) - else: - setattr(self, "IS_CI_RUN", False) - def _set_ci_loop(self): if (getattr(self, "BUILD_TAG") and re.search("daily", getattr(self, "BUILD_TAG"))): |