diff options
| -rw-r--r-- | dovetail/conf/dovetail_config.py | 7 | ||||
| -rwxr-xr-x | dovetail/run.py | 4 | ||||
| -rw-r--r-- | ez_setup.py | 5 |
3 files changed, 9 insertions, 7 deletions
diff --git a/dovetail/conf/dovetail_config.py b/dovetail/conf/dovetail_config.py index 8fa1a6d2..9dcf5ffa 100644 --- a/dovetail/conf/dovetail_config.py +++ b/dovetail/conf/dovetail_config.py @@ -47,9 +47,10 @@ class DovetailConfig: @classmethod def update_envs(cls, options): for item in options: - if options[item] is not None: - key = cls.cmd_name_trans(item) - os.environ[key] = options[item] + key = cls.cmd_name_trans(item) + if not options[item] and key in os.environ: + options[item] = os.environ[key] + if options[item]: cls.update_config_envs('functest', key) cls.update_config_envs('yardstick', key) diff --git a/dovetail/run.py b/dovetail/run.py index 891155b5..b9194c39 100755 --- a/dovetail/run.py +++ b/dovetail/run.py @@ -150,8 +150,6 @@ def main(*args, **kwargs): if 'tag' in kwargs and kwargs['tag'] is not None: set_container_tags(kwargs['tag']) - load_testcase() - testsuite_yaml = load_testsuite(kwargs['testsuite']) testarea = kwargs['testarea'] testsuite_validation = False testarea_validation = False @@ -160,6 +158,8 @@ def main(*args, **kwargs): if kwargs['testsuite'] in dt_config.testsuite_supported: testsuite_validation = True if testsuite_validation and testarea_validation: + testsuite_yaml = load_testsuite(kwargs['testsuite']) + load_testcase() run_test(testsuite_yaml, testarea, logger) Report.generate(testsuite_yaml, testarea) else: diff --git a/ez_setup.py b/ez_setup.py index 4ef3ee01..36da1e62 100644 --- a/ez_setup.py +++ b/ez_setup.py @@ -125,7 +125,7 @@ def _do_download(version, download_base, to_dir, download_delay): egg = os.path.join(to_dir, tp.format(**locals())) if not os.path.exists(egg): archive = download_setuptools(version, download_base, - to_dir, download_delay) + to_dir, download_delay) _build_egg(egg, archive, to_dir) sys.path.insert(0, egg) @@ -235,7 +235,8 @@ def download_file_powershell(url, target): ps_cmd = ( "[System.Net.WebRequest]::DefaultWebProxy.Credentials = " "[System.Net.CredentialCache]::DefaultCredentials; " - '(new-object System.Net.WebClient).DownloadFile("%(url)s", "%(target)s")' + '(new-object System.Net.WebClient).DownloadFile("%(url)s", \ + "%(target)s")' % locals() ) cmd = [ |