diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2017-08-23 16:24:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-23 16:24:56 +0000 |
| commit | 4a228ab09e59c5dfa004df0f54df7c20eba2bc0a (patch) | |
| tree | 82f731fc296f5ec32caf3ad508a59b87d61f898e /functest/utils/functest_utils.py | |
| parent | 172b5709ede1f32b042de621b932f6162f2d89b9 (diff) | |
| parent | 1b7322ab8290b55b1869ac913442070ebe6df2a5 (diff) | |
Merge "Refactor resource creation and cleanup in Tempest"
Diffstat (limited to 'functest/utils/functest_utils.py')
| -rw-r--r-- | functest/utils/functest_utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py index bf68e43a..a766ef95 100644 --- a/functest/utils/functest_utils.py +++ b/functest/utils/functest_utils.py @@ -267,14 +267,14 @@ def get_ci_envvars(): def execute_command_raise(cmd, info=False, error_msg="", - verbose=True, output_file=None): - ret = execute_command(cmd, info, error_msg, verbose, output_file) + verbose=True, output_file=None, env=None): + ret = execute_command(cmd, info, error_msg, verbose, output_file, env) if ret != 0: raise Exception(error_msg) def execute_command(cmd, info=False, error_msg="", - verbose=True, output_file=None): + verbose=True, output_file=None, env=None): if not error_msg: error_msg = ("The command '%s' failed." % cmd) msg_exec = ("Executing command: '%s'" % cmd) @@ -283,7 +283,7 @@ def execute_command(cmd, info=False, error_msg="", logger.info(msg_exec) else: logger.debug(msg_exec) - p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE, + p = subprocess.Popen(cmd, env=env, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) if output_file: f = open(output_file, "w") |