comparison tests/run-tests.py @ 20601:72d843e8cb6d

run-tests: fixed warn detection on failures with too many output

The state "warned" was reported too often. The problem fixed here is that
warnonly was only reset when a line did not match. When there was a line too
much, warnonly remained set.
Fix this by setting more states to warnonly.

More negative testing (testing on result "Failed") has been done this time.

20600:2e68882852ee

    if exitcode == SKIPPED_STATUS or output is None:
        return exitcode, output

    # Merge the script output back into a unified test

    warnonly = True
    pos = -1
    postout = []
    for l in output:
        lout, lcmd = l, None
        if salt in l:

            else:
                if needescape(lout):
                    lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
                postout.append("  " + lout) # let diff deal with it
                if r != '': # if line failed
                    warnonly = False

        if lcmd:
            # add on last return code
            ret = int(lcmd.split()[1])
            if ret != 0:

            pos = int(lcmd.split()[0])

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

    if warnonly and exitcode == 0:
        exitcode = False
    return exitcode, postout

wifexited = getattr(os, "WIFEXITED", lambda x: False)
def run(cmd, wd, options, replacements, env):
    """Run command in a sub-process, capturing the output (stdout and stderr).

20601:72d843e8cb6d

    if exitcode == SKIPPED_STATUS or output is None:
        return exitcode, output

    # Merge the script output back into a unified test

    warnonly = 1 # 1: not yet, 2: yes, 3: for sure not
    if exitcode != 0: # failure has been reported
        warnonly = 3 # set to "for sure not"
    pos = -1
    postout = []
    for l in output:
        lout, lcmd = l, None
        if salt in l:

            else:
                if needescape(lout):
                    lout = stringescape(lout.rstrip('\n')) + " (esc)\n"
                postout.append("  " + lout) # let diff deal with it
                if r != '': # if line failed
                    warnonly = 3 # set to "for sure not"
                elif warnonly == 1: # is "not yet" (and line is warn only)
                    warnonly = 2 # set to "yes" do warn

        if lcmd:
            # add on last return code
            ret = int(lcmd.split()[1])
            if ret != 0:

            pos = int(lcmd.split()[0])

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

    if warnonly == 2:
        exitcode = False # set exitcode to warned
    return exitcode, postout

wifexited = getattr(os, "WIFEXITED", lambda x: False)
def run(cmd, wd, options, replacements, env):
    """Run command in a sub-process, capturing the output (stdout and stderr).