From 16b897a7a9473511a201ec43ab253e21a869fed2 Mon Sep 17 00:00:00 2001 From: "wu.zhihui" Date: Tue, 29 Nov 2016 18:02:15 +0800 Subject: dovetail: modify process flow in function update_envs() bugfix task DOVETAIL-144 1. If run command "python run.py" without options, e.g. --SUT_TYPE, --SUT_IP, env values will be updated by os enviromental parameter. 2. If run command "python run.py" with options, no update from os enviromental parameter. JIRA: DOVETAIL-144 Change-Id: Id3bde7546722a5f4defe52d4f00609d7049a288b Signed-off-by: wu.zhihui --- dovetail/conf/dovetail_config.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'dovetail/conf') 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) -- cgit 1.2.3-korg