aboutsummaryrefslogtreecommitdiffstats
path: root/functest/utils/functest_utils.py
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-07 13:57:29 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 13:57:29 +0000
commit1df61603c6de7880bdd366b979c0a202d3cb8692 (patch)
treedbef038eee9feef2e3af91b63ae2e2ade4c6de0c /functest/utils/functest_utils.py
parent5605ff36c726d49cce33c6ca0f68f802645913bf (diff)
parent842d0b381755176a63b55d045325ed8c1d662407 (diff)
Merge "Remove redundant tempest cleanup utility"
Diffstat (limited to 'functest/utils/functest_utils.py')
-rw-r--r--functest/utils/functest_utils.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/functest/utils/functest_utils.py b/functest/utils/functest_utils.py
index e4062373..f07f59d7 100644
--- a/functest/utils/functest_utils.py
+++ b/functest/utils/functest_utils.py
@@ -227,14 +227,14 @@ def get_ci_envvars():
def execute_command_raise(cmd, info=False, error_msg="",
- verbose=True, output_file=None, env=None):
- ret = execute_command(cmd, info, error_msg, verbose, output_file, env)
+ verbose=True, output_file=None):
+ ret = execute_command(cmd, info, error_msg, verbose, output_file)
if ret != 0:
raise Exception(error_msg)
def execute_command(cmd, info=False, error_msg="",
- verbose=True, output_file=None, env=None):
+ verbose=True, output_file=None):
if not error_msg:
error_msg = ("The command '%s' failed." % cmd)
msg_exec = ("Executing command: '%s'" % cmd)
@@ -243,7 +243,7 @@ def execute_command(cmd, info=False, error_msg="",
logger.info(msg_exec)
else:
logger.debug(msg_exec)
- p = subprocess.Popen(cmd, env=env, shell=True, stdout=subprocess.PIPE,
+ p = subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
if output_file:
f = open(output_file, "w")