##// END OF EJS Templates
run-tests: rename `lout` variable to `out_line`...
marmoute -
r43136:35ef1e95 default
parent child Browse files
Show More
@@ -1612,13 +1612,13 b' class TTest(Test):'
1612 pos = -1
1612 pos = -1
1613 postout = []
1613 postout = []
1614 for out_rawline in output:
1614 for out_rawline in output:
1615 lout, lcmd = out_rawline, None
1615 out_line, lcmd = out_rawline, None
1616 if salt in out_rawline:
1616 if salt in out_rawline:
1617 lout, lcmd = out_rawline.split(salt, 1)
1617 out_line, lcmd = out_rawline.split(salt, 1)
1618
1618
1619 while lout:
1619 while out_line:
1620 if not lout.endswith(b'\n'):
1620 if not out_line.endswith(b'\n'):
1621 lout += b' (no-eol)\n'
1621 out_line += b' (no-eol)\n'
1622
1622
1623 # Find the expected output at the current position.
1623 # Find the expected output at the current position.
1624 els = [None]
1624 els = [None]
@@ -1629,10 +1629,10 b' class TTest(Test):'
1629 for i, el in enumerate(els):
1629 for i, el in enumerate(els):
1630 r = False
1630 r = False
1631 if el:
1631 if el:
1632 r, exact = self.linematch(el, lout)
1632 r, exact = self.linematch(el, out_line)
1633 if isinstance(r, str):
1633 if isinstance(r, str):
1634 if r == '-glob':
1634 if r == '-glob':
1635 lout = ''.join(el.rsplit(' (glob)', 1))
1635 out_line = ''.join(el.rsplit(' (glob)', 1))
1636 r = '' # Warn only this line.
1636 r = '' # Warn only this line.
1637 elif r == "retry":
1637 elif r == "retry":
1638 postout.append(b' ' + el)
1638 postout.append(b' ' + el)
@@ -1669,10 +1669,10 b' class TTest(Test):'
1669 del els[i]
1669 del els[i]
1670 postout.append(b' ' + el)
1670 postout.append(b' ' + el)
1671 else:
1671 else:
1672 if self.NEEDESCAPE(lout):
1672 if self.NEEDESCAPE(out_line):
1673 lout = TTest._stringescape(b'%s (esc)\n' %
1673 out_line = TTest._stringescape(b'%s (esc)\n' %
1674 lout.rstrip(b'\n'))
1674 out_line.rstrip(b'\n'))
1675 postout.append(b' ' + lout) # Let diff deal with it.
1675 postout.append(b' ' + out_line) # Let diff deal with it.
1676 if r != '': # If line failed.
1676 if r != '': # If line failed.
1677 warnonly = WARN_NO
1677 warnonly = WARN_NO
1678 elif warnonly == WARN_UNDEFINED:
1678 elif warnonly == WARN_UNDEFINED:
General Comments 0
You need to be logged in to leave comments. Login now