summaryrefslogtreecommitdiffstats
path: root/testcases/functest_utils.py
diff options
context:
space:
mode:
authorRyota MIBU <r-mibu@cq.jp.nec.com>2016-01-15 00:25:09 +0900
committerRyota MIBU <r-mibu@cq.jp.nec.com>2016-01-15 18:24:47 +0900
commit4781a7b06cdba9bcf4489b1cb4e94ffdeec677bd (patch)
tree665ee79dffda85867b2106fb383e6fb279231c23 /testcases/functest_utils.py
parentbe4d2778d535272a3683cb8e518c85065af6a582 (diff)
add doctor test case
Change-Id: Ia40face4cb32247542d5841e00caafb2cf927c2e Signed-off-by: Ryota MIBU <r-mibu@cq.jp.nec.com>
Diffstat (limited to 'testcases/functest_utils.py')
-rw-r--r--testcases/functest_utils.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/testcases/functest_utils.py b/testcases/functest_utils.py
index e7641b01d..a104182b5 100644
--- a/testcases/functest_utils.py
+++ b/testcases/functest_utils.py
@@ -577,7 +577,7 @@ def download_url(url, dest_path):
return True
-def execute_command(cmd, logger=None):
+def execute_command(cmd, logger=None, exit_on_error=True):
"""
Execute Linux command
"""
@@ -596,7 +596,9 @@ def execute_command(cmd, logger=None):
else:
if logger:
logger.error("Error when executing command %s" % cmd)
- exit(-1)
+ if exit_on_error:
+ exit(-1)
+ return False
def get_git_branch(repo_path):
@@ -646,7 +648,8 @@ def push_results_to_db(db_url, case_name, logger, pod_name,
headers = {'Content-Type': 'application/json'}
try:
r = requests.post(url, data=json.dumps(params), headers=headers)
- logger.debug(r)
+ if logger:
+ logger.debug(r)
return True
except:
print "Error:", sys.exc_info()[0]