tools/extracttests.py: test code was not extracted properly for some tests (#5776)
This commit is contained in:
parent
2932ab7592
commit
34fb24d5a9
|
@ -94,8 +94,7 @@ class Extract:
|
||||||
start_code = None
|
start_code = None
|
||||||
disable = False
|
disable = False
|
||||||
|
|
||||||
fin = open(filename, 'r')
|
for line in open(filename, 'r'):
|
||||||
for line in fin:
|
|
||||||
# testclass starts
|
# testclass starts
|
||||||
res = re.match('class (' + name + ')', line)
|
res = re.match('class (' + name + ')', line)
|
||||||
if res is not None:
|
if res is not None:
|
||||||
|
@ -137,6 +136,10 @@ class Extract:
|
||||||
if code is not None:
|
if code is not None:
|
||||||
res = re.match('\\s+' + string, line)
|
res = re.match('\\s+' + string, line)
|
||||||
if res is not None:
|
if res is not None:
|
||||||
|
if line.find('",') > line.find('"'):
|
||||||
|
code = None
|
||||||
|
continue
|
||||||
|
|
||||||
code = code + res.group(1)
|
code = code + res.group(1)
|
||||||
if res.group(1).find('"') > 0:
|
if res.group(1).find('"') > 0:
|
||||||
code = None
|
code = None
|
||||||
|
@ -159,10 +162,8 @@ class Extract:
|
||||||
'expected': expected}
|
'expected': expected}
|
||||||
self.nodes.append(node)
|
self.nodes.append(node)
|
||||||
code = None
|
code = None
|
||||||
|
elif re.match('\\s+[TOD_]*ASSERT', line) is not None:
|
||||||
# close test file
|
code = None
|
||||||
fin.close()
|
|
||||||
|
|
||||||
|
|
||||||
def strtoxml(s):
|
def strtoxml(s):
|
||||||
"""Convert string to xml/html format"""
|
"""Convert string to xml/html format"""
|
||||||
|
|
Loading…
Reference in New Issue