# HG changeset patch # User Jun Wu # Date 1506993763 25200 # Node ID df78b1a24094a89dd8678e05b9a96ebcc3c791af # Parent f2268edf38d5ab8c7617b8e069aa1f501d77d910 test-logtoprocess: make it compatible with chg chg runs more commands and outputs more lines. This patch matches them. Differential Revision: https://phab.mercurial-scm.org/D914 diff -r f2268edf38d5 -r df78b1a24094 tests/run-tests.py --- a/tests/run-tests.py Tue Oct 03 11:10:03 2017 -0700 +++ b/tests/run-tests.py Mon Oct 02 18:22:43 2017 -0700 @@ -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. diff -r f2268edf38d5 -r df78b1a24094 tests/test-logtoprocess.t --- a/tests/test-logtoprocess.t Tue Oct 03 11:10:03 2017 -0700 +++ b/tests/test-logtoprocess.t Mon Oct 02 18:22:43 2017 -0700 @@ -45,9 +45,11 @@ + (chg !) 0 a message: spam command + command (chg !) commandfinish foo foo @@ -55,8 +57,11 @@ 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: