pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] P3: phantomjs & text model

Browse Source 
In P3, can only append integers to bytearray, not bytes, also fix some
byte/string comparisons & encoding crap
This commit is contained in:
Xavier Morel
2017-08-20 23:25:54 +02:00
committed by Olivier Dony
parent 40d1246a17
commit 97515adde4
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
odoo/tests/common.py
+8 -8
View File
@@ -337,16 +337,16 @@ class HttpCase(TransactionCase):
s = phantom.stdout.read(1)
if not s:
break
buf.append(s)
buf.extend(s)
# process lines
if '\n' in buf and (not buf.startswith('<phantomLog>') or '</phantomLog>' in buf):
if buf.startswith('<phantomLog>'):
line = buf[12:buf.index('</phantomLog>')]
if b'\n' in buf and (not buf.startswith(b'<phantomLog>') or b'</phantomLog>' in buf):
if buf.startswith(b'<phantomLog>'):
line = buf[12:buf.index(b'</phantomLog>')]
buf = bytearray()
else:
line, buf = buf.split('\n', 1)
line = str(line)
line, buf = buf.split(b'\n', 1)
line = bytes(line).decode('utf-8')
lline = line.lower()
if lline.startswith(("error", "server application error")):
@@ -355,11 +355,11 @@ class HttpCase(TransactionCase):
prefix = lline.index('error') + 6
_logger.error("phantomjs: %s", pformat(json.loads(line[prefix:])))
except ValueError:
line_ = line.split('\n\n')
line_ = lline.split('\n\n')
_logger.error("phantomjs: %s", line_[0])
# The second part of the log is for debugging
if len(line_) > 1:
_logger.info("phantomjs: \n%s", line.split('\n\n', 1)[1])
_logger.info("phantomjs: \n%s", lline.split('\n\n', 1)[1])
pass
break
elif lline.startswith("warning"):