This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1159

run-tests: move newline out of colorized message
ClosedPublic

Authored by martinvonz on Oct 17 2017, 2:02 PM.

Details

Reviewers
mbthomas
Group Reviewers
hg-reviewers
Commits
rHG8bce3e51b101: run-tests: move newline out of colorized message
Summary

The leading newline before "ERROR:" led to an incorrect lexing of the
message and the newline got lost.

The fixed formatting can be seen in the test case. The reason we
didn't notice before was that the bad formatting just led to the loss
of a blank line in the test. However, there are other cases where it
would be joined with a line saying "Accept this change? [n]" or
"Reference output has changed (run again to prompt changes)".

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Oct 17 2017, 2:02 PM
mbthomas accepted this revision.Oct 17 2017, 2:09 PM
Closed by commit rHG8bce3e51b101: run-tests: move newline out of colorized message (authored by martinvonz). · Explain WhyOct 18 2017, 8:46 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mtests/run-tests.py (4 lines)
Mtests/test-run-tests.t (1 line)

Diff 2971

tests/run-tests.py

if self._options.first: if self._options.first:
self.stop() self.stop()
else: else:
with iolock: with iolock:
if reason == "timed out": if reason == "timed out":
self.stream.write('t') self.stream.write('t')
else: else:
if not self._options.nodiff: if not self._options.nodiff:
formatted = '\nERROR: %s output changed\n' % test self.stream.write('\n')
# Exclude the '\n' from highlighting to lex correctly
formatted = 'ERROR: %s output changed\n' % test
self.stream.write(highlightmsg(formatted, self.color)) self.stream.write(highlightmsg(formatted, self.color))
self.stream.write('!') self.stream.write('!')
self.stream.flush() self.stream.flush()
def addSuccess(self, test): def addSuccess(self, test):
with iolock: with iolock:
super(TestResult, self).addSuccess(test) super(TestResult, self).addSuccess(test)

tests/test-run-tests.t

\x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc) \x1b[38;5;124m--- $TESTTMP/test-failure.t\x1b[39m (esc)
\x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc) \x1b[38;5;34m+++ $TESTTMP/test-failure.t.err\x1b[39m (esc)
\x1b[38;5;90;01m@@ -1,3 +1,3 @@\x1b[39;00m (esc) \x1b[38;5;90;01m@@ -1,3 +1,3 @@\x1b[39;00m (esc)
$ echo "bar-baz"; echo "bar-bad" $ echo "bar-baz"; echo "bar-bad"
\x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc) \x1b[38;5;34m+ bar*baz (glob)\x1b[39m (esc)
bar*bad (glob) bar*bad (glob)
\x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc) \x1b[38;5;124m- bar*baz (glob)\x1b[39m (esc)
\x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc) \x1b[38;5;88mERROR: \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m output changed\x1b[39m (esc)
! !
\x1b[38;5;88mFailed \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m: output changed\x1b[39m (esc) \x1b[38;5;88mFailed \x1b[39m\x1b[38;5;9mtest-failure.t\x1b[39m\x1b[38;5;88m: output changed\x1b[39m (esc)
# Ran 1 tests, 0 skipped, 1 failed. # Ran 1 tests, 0 skipped, 1 failed.
python hash seed: * (glob) python hash seed: * (glob)
[1] [1]
$ rt test-failure.t 2> tmp.log $ rt test-failure.t 2> tmp.log