quark created this revision. Herald added a subscriber: mercurial-devel. Herald added a reviewer: hg-reviewers.
REVISION SUMMARY chg runs more commands and outputs more lines. This patch matches them. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D914 AFFECTED FILES tests/run-tests.py tests/test-logtoprocess.t CHANGE DETAILS diff --git a/tests/test-logtoprocess.t b/tests/test-logtoprocess.t --- a/tests/test-logtoprocess.t +++ b/tests/test-logtoprocess.t @@ -45,18 +45,23 @@ + (chg !) 0 a message: spam command + command (chg !) commandfinish foo foo foo foo foo exited 0 after * seconds (glob) logtoprocess command output: + logtoprocess command output: (chg !) logtoprocess commandfinish output: logtoprocess foo output: + serve --cmdserver chgunix * (glob) (chg !) + serve --cmdserver chgunix * (glob) (chg !) spam Confirm that logging blocked time catches stdio properly: diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -595,7 +595,7 @@ # list in group 2, and the preceeding line output in group 1: # # output..output (feature !)\n -optline = re.compile(b'(.+) \((.+?) !\)\n$') +optline = re.compile(b'(.*) \((.+?) !\)\n$') def cdatasafe(data): """Make a string safe to include in a CDATA block. To: quark, #hg-reviewers Cc: mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel