Fix ERROR check. The word ERROR can be as a part of proper output
Change-Id: Ib175b4058f364160063c54af80f8c543981eb492
diff --git a/tcp_tests/managers/runtestmanager.py b/tcp_tests/managers/runtestmanager.py
index f5797f8..66095dc 100644
--- a/tcp_tests/managers/runtestmanager.py
+++ b/tcp_tests/managers/runtestmanager.py
@@ -225,10 +225,6 @@
api_return = api_return['return'][0]
if only_first_match:
api_return = next(api_return.iteritems())[1]
- if 'ERROR' or 'not available' in api_return:
- LOG.info("Next error ocured during processing"
- " API request: {}".format(api_return))
- return False
return api_return
else:
LOG.info('''Salt api returns empty result: [{}]''')
@@ -256,6 +252,10 @@
logs_res = self.salt_api.local(tgt, 'dockerng.logs',
self.container_name)
logs = simplify_salt_api_return(logs_res)
+ rm_res = self.salt_api.local(tgt, 'dockerng.rm',
+ self.container_name)
+ LOG.info("Tempest container was removed: {}".format(
+ json.dumps(rm_res, indent=4)))
else:
inspect_res = self.salt_api.local(tgt, 'dockerng.inspect',
self.container_name)
@@ -274,15 +274,6 @@
logs = None
inspect = None
- rm_res = self.salt_api.local(tgt, 'dockerng.rm',
- self.container_name)
- rm = simplify_salt_api_return(rm_res)
- if 'ERROR' in rm:
- LOG.info("Something went wrong with removing container")
- LOG.info("dockerng.rm stdout {}".format(rm))
- else:
- LOG.info("Tempest container was removed: {}".format(
- json.dumps(rm_res, indent=4)))
return {'inspect': inspect,
'logs': logs}