openstack/fuel-qa
Code Issues Proposed changes

Do not check exit code while curl to ostf api

Browse Source 
Change-Id: I1ada31a36bf85134877fb0d43140c3227b119b92
Closes-Bug: #1569252
This commit is contained in:
Tatyana Leontovich 2016-04-12 13:03:57 +03:00 committed by tatyana-leontovich
parent 40e17c3856
commit 2978020181
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gates_tests/helpers/utils.py
View File

@ -158,7 +158,8 @@ def update_ostf():
cmd = "service ostf status" cmd = "service ostf status"
helpers.wait(lambda: "dead" in ssh.execute_on_remote( helpers.wait(lambda: "dead" in ssh.execute_on_remote(
ssh.admin_ip, cmd=cmd, ssh.admin_ip, cmd=cmd,
raise_on_assert=False)['stdout_str'], timeout=60) raise_on_assert=False,
assert_ec_equal=[3])['stdout_str'], timeout=60)
logger.info("OSTF status: inactive") logger.info("OSTF status: inactive")
cmd = "rpm -e fuel-ostf" cmd = "rpm -e fuel-ostf"
ssh.execute_on_remote(ssh.admin_ip, cmd=cmd) ssh.execute_on_remote(ssh.admin_ip, cmd=cmd)
@ -182,7 +183,7 @@ def update_ostf():
cmd = "curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:8777" cmd = "curl -s -o /dev/null -w '%{http_code}' http://127.0.0.1:8777"
helpers.wait( helpers.wait(
lambda: "401" in ssh.execute_on_remote( lambda: "401" in ssh.execute_on_remote(
ssh.admin_ip, cmd=cmd)['stdout_str'], ssh.admin_ip, cmd=cmd, raise_on_assert=False)['stdout_str'],
timeout=60) timeout=60)
logger.info("OSTF status: RUNNING") logger.info("OSTF status: RUNNING")