D3512: tests: port test-ui-color.py to Python 3

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Tue May 8 16:46:34 EDT 2018


durin42 created this revision.
Herald added a reviewer: pulkit.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  As in some other tests, I like confirming that we're dealing with
  bytes here, so the b prefix is now in the expected output on both 2
  and 3.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-ui-color.py
  tests/test-ui-color.py.out

CHANGE DETAILS

diff --git a/tests/test-ui-color.py.out b/tests/test-ui-color.py.out
--- a/tests/test-ui-color.py.out
+++ b/tests/test-ui-color.py.out
@@ -1,5 +1,5 @@
 warning
 error
-'buffered\n'
+b'buffered\n'
 colored? True
 colored? True
diff --git a/tests/test-ui-color.py b/tests/test-ui-color.py
--- a/tests/test-ui-color.py
+++ b/tests/test-ui-color.py
@@ -5,14 +5,17 @@
     dispatch,
     ui as uimod,
 )
+from mercurial.utils import (
+    stringutil,
+)
 
 # ensure errors aren't buffered
 testui = uimod.ui()
 testui.pushbuffer()
 testui.write((b'buffered\n'))
 testui.warn((b'warning\n'))
 testui.write_err(b'error\n')
-print(repr(testui.popbuffer()))
+print(stringutil.pprint(testui.popbuffer()).decode('ascii'))
 
 # test dispatch.dispatch with the same ui object
 hgrc = open(os.environ["HGRCPATH"], 'wb')
@@ -35,4 +38,3 @@
 print("colored? %s" % (ui_._colormode is not None))
 runcmd()
 print("colored? %s" % (ui_._colormode is not None))
-
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -450,6 +450,7 @@
 test-tags.t
 test-template-engine.t
 test-treemanifest.t
+test-ui-color.py
 test-unamend.t
 test-uncommit.t
 test-unified-test.t



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


More information about the Mercurial-devel mailing list