odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] openerp: tests: make failing PhantomJS tests actually fail

This commit is contained in:
Jairo Llopis 2016-10-11 12:40:40 +02:00 committed by Aaron Bohy
parent 001610ece9
commit 85b34f4be3
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openerp/tests/common.py
View File

@ -316,7 +316,7 @@ class HttpCase(TransactionCase):
_logger.info("phantomjs: %s", line) _logger.info("phantomjs: %s", line)
if line == "ok": if line == "ok":
break return True
if line.startswith("error"): if line.startswith("error"):
line_ = line[6:] line_ = line[6:]
# when error occurs the execution stack may be sent as as JSON # when error occurs the execution stack may be sent as as JSON
@ -337,8 +337,9 @@ class HttpCase(TransactionCase):
phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=None) phantom = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=None)
except OSError: except OSError:
raise unittest2.SkipTest("PhantomJS not found") raise unittest2.SkipTest("PhantomJS not found")
result = False
try: try:
self.phantom_poll(phantom, timeout) result = self.phantom_poll(phantom, timeout)
finally: finally:
# kill phantomjs if phantom.exit() wasn't called in the test # kill phantomjs if phantom.exit() wasn't called in the test
if phantom.poll() is None: if phantom.poll() is None:
@ -347,6 +348,10 @@ class HttpCase(TransactionCase):
self._wait_remaining_requests() self._wait_remaining_requests()
# we ignore phantomjs return code as we kill it as soon as we have ok # we ignore phantomjs return code as we kill it as soon as we have ok
_logger.info("phantom_run execution finished") _logger.info("phantom_run execution finished")
self.assertTrue(
result,
"PhantomJS test completed without reporting success; "
"the log may contain errors or hints.")
def _wait_remaining_requests(self): def _wait_remaining_requests(self):
t0 = int(time.time()) t0 = int(time.time())