run-tests: test result shows when a failed test could not start a server Failing to start a server happens regularly, at least on windows buildbot. Such a failure often has nothing to do with the test, but with the environment. But half the test output can change because some data is missing. Therefore this is worth an extended error message. Detect the server failure in the diff output because it is most reliable there. Checking the output only does not show if the server failure was expected. Old failure message when server start failed: Failed test-serve.t: output changed New message: Failed test-serve.t: serve failed and output changed [ original upstream message ]

     1

import sys

     2

     3

globalvars = {}

     4

localvars = {}

     5

lines = sys.stdin.readlines()

     6

while lines:

     7

    l = lines.pop(0)

     8

    if l.startswith('SALT'):

     9

        print l[:-1]

    10

    elif l.startswith('>>> '):

    11

        snippet = l[4:]

    12

        while lines and lines[0].startswith('... '):

    13

            l = lines.pop(0)

    14

            snippet += "\n" + l[4:]

    15

        c = compile(snippet, '<heredoc>', 'single')

    16

        try:

    17

            exec c in globalvars, localvars

    18

        except Exception, inst:

    19

            print repr(inst)