##// END OF EJS Templates
run-tests: rename `lcmd` variable to `line_cmd`...
marmoute -
r43137:5ca351ba default
parent child Browse files
Show More
@@ -1612,9 +1612,9 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 out_line, lcmd = out_rawline, None
1615 out_line, cmd_line = out_rawline, None
1616 if salt in out_rawline:
1616 if salt in out_rawline:
1617 out_line, lcmd = out_rawline.split(salt, 1)
1617 out_line, cmd_line = out_rawline.split(salt, 1)
1618
1618
1619 while out_line:
1619 while out_line:
1620 if not out_line.endswith(b'\n'):
1620 if not out_line.endswith(b'\n'):
@@ -1695,15 +1695,15 b' class TTest(Test):'
1695 continue
1695 continue
1696 postout.append(b' ' + el)
1696 postout.append(b' ' + el)
1697
1697
1698 if lcmd:
1698 if cmd_line:
1699 # Add on last return code.
1699 # Add on last return code.
1700 ret = int(lcmd.split()[1])
1700 ret = int(cmd_line.split()[1])
1701 if ret != 0:
1701 if ret != 0:
1702 postout.append(b' [%d]\n' % ret)
1702 postout.append(b' [%d]\n' % ret)
1703 if pos in after:
1703 if pos in after:
1704 # Merge in non-active test bits.
1704 # Merge in non-active test bits.
1705 postout += after.pop(pos)
1705 postout += after.pop(pos)
1706 pos = int(lcmd.split()[0])
1706 pos = int(cmd_line.split()[0])
1707
1707
1708 if pos in after:
1708 if pos in after:
1709 postout += after.pop(pos)
1709 postout += after.pop(pos)
General Comments 0
You need to be logged in to leave comments. Login now