# HG changeset patch # User Augie Fackler <augie@google.com> # Date 2018-04-27 15:59:21 # Node ID b8c2004a8d2b7a568c90fe2bcce6490dffbb2b43 # Parent 32106c4740863f1840fc296652360bd98bda3eef tests: port test-ui-color.py to Python 3 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. Differential Revision: https://phab.mercurial-scm.org/D3512 diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -450,6 +450,7 @@ test-tag.t test-tags.t test-template-engine.t test-treemanifest.t +test-ui-color.py test-unamend.t test-uncommit.t test-unified-test.t 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,6 +5,9 @@ from mercurial import ( dispatch, ui as uimod, ) +from mercurial.utils import ( + stringutil, +) # ensure errors aren't buffered testui = uimod.ui() @@ -12,7 +15,7 @@ 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 @@ runcmd() print("colored? %s" % (ui_._colormode is not None)) runcmd() print("colored? %s" % (ui_._colormode is not None)) - 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