Patchwork D3507: tests: fix test-status-inprocess.py on Python 3

login
register
mail settings
Submitter phabricator
Date May 8, 2018, 8:22 p.m.
Message ID <65d482e82eb9d66799bcc849462ff0a1@localhost.localdomain>
Download mbox | patch
Permalink /patch/31414/
State Not Applicable
Headers show

Comments

phabricator - May 8, 2018, 8:22 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGbbff7170f665: tests: fix test-status-inprocess.py on Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3507?vs=8575&id=8583

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

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-status-inprocess.py

CHANGE DETAILS




To: durin42, pulkit, #hg-reviewers, indygreg
Cc: mercurial-devel

Patch

diff --git a/tests/test-status-inprocess.py b/tests/test-status-inprocess.py
--- a/tests/test-status-inprocess.py
+++ b/tests/test-status-inprocess.py
@@ -1,12 +1,24 @@ 
 #!/usr/bin/env python
 from __future__ import absolute_import, print_function
 
+import sys
+
 from mercurial import (
     commands,
     localrepo,
     ui as uimod,
 )
 
+print_ = print
+def print(*args, **kwargs):
+    """print() wrapper that flushes stdout buffers to avoid py3 buffer issues
+
+    We could also just write directly to sys.stdout.buffer the way the
+    ui object will, but this was easier for porting the test.
+    """
+    print_(*args, **kwargs)
+    sys.stdout.flush()
+
 u = uimod.ui.load()
 
 print('% creating repo')
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -430,6 +430,7 @@ 
 test-ssh-proto.t
 test-sshserver.py
 test-stack.t
+test-status-inprocess.py
 test-status-rev.t
 test-status-terse.t
 test-strip-cross.t