Patchwork [2,of,2] test-http-branchmap: fix stdio mode on Windows

login
register
mail settings
Submitter Yuya Nishihara
Date May 13, 2018, 2:27 a.m.
Message ID <74982ab8ca762a3cfe36.1526178435@mimosa>
Download mbox | patch
Permalink /patch/31568/
State Accepted
Headers show

Comments

Yuya Nishihara - May 13, 2018, 2:27 a.m.
# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1526177393 -32400
#      Sun May 13 11:09:53 2018 +0900
# Node ID 74982ab8ca762a3cfe3648740dae27555232476b
# Parent  af07d426066dd8326c50a5686d7ecd25072d67b3
test-http-branchmap: fix stdio mode on Windows
Matt Harbison - May 13, 2018, 5:23 a.m.
On Sat, 12 May 2018 22:27:15 -0400, Yuya Nishihara <yuya@tcha.org> wrote:

> # HG changeset patch
> # User Yuya Nishihara <yuya@tcha.org>
> # Date 1526177393 -32400
> #      Sun May 13 11:09:53 2018 +0900
> # Node ID 74982ab8ca762a3cfe3648740dae27555232476b
> # Parent  af07d426066dd8326c50a5686d7ecd25072d67b3
> test-http-branchmap: fix stdio mode on Windows

Works for me, thanks.  I'll clean up the buildbot on Monday.
Matt Harbison - May 17, 2018, 10:10 p.m.
On Sun, 13 May 2018 01:23:36 -0400, Matt Harbison <mharbison72@gmail.com>  
wrote:

> On Sat, 12 May 2018 22:27:15 -0400, Yuya Nishihara <yuya@tcha.org> wrote:
>
>> # HG changeset patch
>> # User Yuya Nishihara <yuya@tcha.org>
>> # Date 1526177393 -32400
>> #      Sun May 13 11:09:53 2018 +0900
>> # Node ID 74982ab8ca762a3cfe3648740dae27555232476b
>> # Parent  af07d426066dd8326c50a5686d7ecd25072d67b3
>> test-http-branchmap: fix stdio mode on Windows
>
> Works for me, thanks.  I'll clean up the buildbot on Monday.

Gentle ping on this.

Patch

diff --git a/tests/test-http-branchmap.t b/tests/test-http-branchmap.t
--- a/tests/test-http-branchmap.t
+++ b/tests/test-http-branchmap.t
@@ -59,7 +59,7 @@  verify 7e7d56fe4833 (encoding fallback i
 
   $ cat <<EOF > oldhg
   > import threading
-  > from mercurial import hg, ui, wireprotoserver
+  > from mercurial import dispatch, hg, ui, wireprotoserver
   > 
   > class StdoutWrapper(object):
   >     def __init__(self, stdout):
@@ -77,6 +77,7 @@  verify 7e7d56fe4833 (encoding fallback i
   >     def __getattr__(self, name):
   >         return getattr(self._file, name)
   > 
+  > dispatch.initstdio()
   > myui = ui.ui.load()
   > fout = StdoutWrapper(myui.fout)
   > myui.fout = myui.ferr