Mercurial > hg
changeset 34444:df78b1a24094
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
| author | Jun Wu <quark@fb.com> |
|---|---|
| date | Mon, 02 Oct 2017 18:22:43 -0700 |
| parents | f2268edf38d5 |
| children | 5b19f0442043 |
| files | tests/run-tests.py tests/test-logtoprocess.t |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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: