Show More
@@ -1616,6 +1616,24 b' class TTest(Test):' | |||
|
1616 | 1616 | if salt in out_rawline: |
|
1617 | 1617 | out_line, cmd_line = out_rawline.split(salt, 1) |
|
1618 | 1618 | |
|
1619 | pos, postout, warnonly = self._process_out_line(out_line, | |
|
1620 | pos, | |
|
1621 | postout, | |
|
1622 | expected, | |
|
1623 | warnonly) | |
|
1624 | pos, postout = self._process_cmd_line(cmd_line, pos, postout, | |
|
1625 | after) | |
|
1626 | ||
|
1627 | if pos in after: | |
|
1628 | postout += after.pop(pos) | |
|
1629 | ||
|
1630 | if warnonly == WARN_YES: | |
|
1631 | exitcode = False # Set exitcode to warned. | |
|
1632 | ||
|
1633 | return exitcode, postout | |
|
1634 | ||
|
1635 | def _process_out_line(self, out_line, pos, postout, expected, warnonly): | |
|
1636 | if True: | |
|
1619 | 1637 | while out_line: |
|
1620 | 1638 | if not out_line.endswith(b'\n'): |
|
1621 | 1639 | out_line += b' (no-eol)\n' |
@@ -1694,16 +1712,7 b' class TTest(Test):' | |||
|
1694 | 1712 | else: |
|
1695 | 1713 | continue |
|
1696 | 1714 | postout.append(b' ' + el) |
|
1697 | ||
|
1698 | pos, postout = self._process_cmd_line(cmd_line, pos, postout, after) | |
|
1699 | ||
|
1700 | if pos in after: | |
|
1701 | postout += after.pop(pos) | |
|
1702 | ||
|
1703 | if warnonly == WARN_YES: | |
|
1704 | exitcode = False # Set exitcode to warned. | |
|
1705 | ||
|
1706 | return exitcode, postout | |
|
1715 | return pos, postout, warnonly | |
|
1707 | 1716 | |
|
1708 | 1717 | def _process_cmd_line(self, cmd_line, pos, postout, after): |
|
1709 | 1718 | """process a "command" part of a line from unified test output""" |
General Comments 0
You need to be logged in to leave comments.
Login now