diff -r 432b85a46717 -r 51a9f0246931 tests/run-tests.py
--- a/tests/run-tests.py	Tue Feb 27 14:49:05 2018 +0530
+++ b/tests/run-tests.py	Mon Feb 26 23:34:29 2018 -0500
@@ -1762,10 +1762,6 @@
             else:
                 servefail, lines = getdiff(expected, got,
                                            test.refpath, test.errpath)
-                if servefail:
-                    self.stream.write(
-                        'server failed to start (HGPORT=%s)' % test._startport)
-
                 self.stream.write('\n')
                 for line in lines:
                     line = highlightdiff(line, self.color)
@@ -1777,6 +1773,10 @@
                         self.stream.write(line)
                         self.stream.flush()
 
+                if servefail:
+                    raise test.failureException(
+                        'server failed to start (HGPORT=%s)' % test._startport)
+
             # handle interactive prompt without releasing iolock
             if self._options.interactive:
                 if test.readrefout() != expected: