projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d27526d
)
[IMP] filter out phantomjs warning on OSX
author
Xavier Morel
<xmo@openerp.com>
Fri, 21 Feb 2014 14:35:12 +0000
(15:35 +0100)
committer
Xavier Morel
<xmo@openerp.com>
Fri, 21 Feb 2014 14:35:12 +0000
(15:35 +0100)
bzr revid: xmo@openerp.com-
20140221143512
-0qmmxq0gibmdgk6d
addons/web/tests/qunitsuite/suite.py
patch
|
blob
|
history
diff --git
a/addons/web/tests/qunitsuite/suite.py
b/addons/web/tests/qunitsuite/suite.py
index
1b6bc7a
..
54d2e18
100644
(file)
--- a/
addons/web/tests/qunitsuite/suite.py
+++ b/
addons/web/tests/qunitsuite/suite.py
@@
-59,7
+59,7
@@
class QUnitSuite(unittest.TestSuite):
'timeout': self.timeout,
'inject': os.path.join(ROOT, 'qunit-phantomjs-bridge.js')
})
- ], stdout=subprocess.PIPE)
+ ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
try:
while True:
@@
-75,7
+75,12
@@
class QUnitSuite(unittest.TestSuite):
phantom.terminate()
def process(self, line, result):
- args = json.loads(line)
+ try:
+ args = json.loads(line)
+ except ValueError: # phantomjs stderr
+ if 'CoreText' not in line:
+ print line
+ return False
event_name = args[0]
if event_name == 'qunit.done':