Patchwork D914: test-logtoprocess: make it compatible with chg

login
register
mail settings
Submitter phabricator
Date Oct. 4, 2017, 1:16 p.m.
Message ID <24227c8adc065d265517ada0cfa34644@localhost.localdomain>
Download mbox | patch
Permalink /patch/24464/
State Not Applicable
Headers show

Comments

phabricator - Oct. 4, 2017, 1:16 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf78b1a24094: test-logtoprocess: make it compatible with chg (authored by quark, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D914?vs=2369&id=2400

REVISION DETAIL
  https://phab.mercurial-scm.org/D914

AFFECTED FILES
  tests/run-tests.py
  tests/test-logtoprocess.t

CHANGE DETAILS




To: quark, #hg-reviewers
Cc: mercurial-devel

Patch

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.