From 42763039f0ceb3fcaf875d6afbc29d9ea9827350 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 21 Feb 2014 15:35:12 +0100 Subject: [PATCH] [IMP] filter out phantomjs warning on OSX bzr revid: xmo@openerp.com-20140221143512-0qmmxq0gibmdgk6d --- addons/web/tests/qunitsuite/suite.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web/tests/qunitsuite/suite.py b/addons/web/tests/qunitsuite/suite.py index 1b6bc7ae0ac..54d2e18e36e 100644 --- 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':