Minor improvement for --parse-errors

This commit is contained in:
Miroslav Stampar
2019-05-28 23:44:27 +02:00
parent 8ca4cffb98
commit 00435934bc
3 changed files with 11 additions and 5 deletions

View File

@@ -2642,7 +2642,9 @@ def extractErrorMessage(page):
"""
Returns reported error message from page if it founds one
>>> extractErrorMessage(u'<html><title>Test</title>\\n<b>Warning</b>: oci_parse() [function.oci-parse]: ORA-01756: quoted string not properly terminated<br><p>Only a test page</p></html>') == u'oci_parse() [function.oci-parse]: ORA-01756: quoted string not properly terminated'
>>> extractErrorMessage(u'<html><title>Test</title>\\n<b>Warning</b>: oci_parse() [function.oci-parse]: ORA-01756: quoted string not properly terminated<br><p>Only a test page</p></html>')
'oci_parse() [function.oci-parse]: ORA-01756: quoted string not properly terminated'
>>> extractErrorMessage('Warning: This is only a dummy foobar test') is None
True
"""
@@ -2653,8 +2655,10 @@ def extractErrorMessage(page):
match = re.search(regex, page, re.IGNORECASE)
if match:
retVal = htmlUnescape(match.group("result")).replace("<br>", "\n").strip()
break
candidate = htmlUnescape(match.group("result")).replace("<br>", "\n").strip()
if re.search(r"\b([a-z]+ ){5}", candidate) is None: # check for legitimate (e.g. Warning:...) text
retVal = candidate
break
return retVal