comparison tests/run-tests.py @ 42899:f461b65866e9

run-tests: extract a `process_out_line` from the main function

The main function doing line comparison is quite complex. Slicing it in smaller
piece should clarify it.

To avoid a huge diff, the code is kept at the same indentation. We'll re-indent
in the next changesets.

(This is a gratuitous cleanup that I made while investigating a bug).

42898:fc8072f38fd6

        for out_rawline in output:
            out_line, cmd_line = out_rawline, None
            if salt in out_rawline:
                out_line, cmd_line = out_rawline.split(salt, 1)

            while out_line:
                if not out_line.endswith(b'\n'):
                    out_line += b' (no-eol)\n'

                # Find the expected output at the current position.

                                    # Don't append as optional line
                                    continue
                            else:
                                continue
                    postout.append(b'  ' + el)

            pos, postout = self._process_cmd_line(cmd_line, pos, postout, after)

        if pos in after:
            postout += after.pop(pos)

        if warnonly == WARN_YES:
            exitcode = False # Set exitcode to warned.

        return exitcode, postout

    def _process_cmd_line(self, cmd_line, pos, postout, after):
        """process a "command" part of a line from unified test output"""
        if cmd_line:
            # Add on last return code.

42899:f461b65866e9

        for out_rawline in output:
            out_line, cmd_line = out_rawline, None
            if salt in out_rawline:
                out_line, cmd_line = out_rawline.split(salt, 1)

            pos, postout, warnonly = self._process_out_line(out_line,
                                                            pos,
                                                            postout,
                                                            expected,
                                                            warnonly)
            pos, postout = self._process_cmd_line(cmd_line, pos, postout,
                                                  after)

        if pos in after:
            postout += after.pop(pos)

        if warnonly == WARN_YES:
            exitcode = False # Set exitcode to warned.

        return exitcode, postout

    def _process_out_line(self, out_line, pos, postout, expected, warnonly):
        if True:
            while out_line:
                if not out_line.endswith(b'\n'):
                    out_line += b' (no-eol)\n'

                # Find the expected output at the current position.

                                    # Don't append as optional line
                                    continue
                            else:
                                continue
                    postout.append(b'  ' + el)
        return pos, postout, warnonly

    def _process_cmd_line(self, cmd_line, pos, postout, after):
        """process a "command" part of a line from unified test output"""
        if cmd_line:
            # Add on last return code.