py3: add some py3 specific output to test
authorPulkit Goyal <pulkit@yandex-team.ru>
Sat, 13 Oct 2018 04:47:51 +0300
changeset 40224 63245ad598af
parent 40223 cabf09dbc6e0
child 40225 474809790256
py3: add some py3 specific output to test This makes the test work on Python 3. Differential Revision: https://phab.mercurial-scm.org/D5035
contrib/python3-whitelist
tests/test-globalopts.t
--- a/contrib/python3-whitelist	Sat Oct 13 04:42:14 2018 +0300
+++ b/contrib/python3-whitelist	Sat Oct 13 04:47:51 2018 +0300
@@ -193,6 +193,7 @@
 test-generaldelta.t
 test-getbundle.t
 test-git-export.t
+test-globalopts.t
 test-glog-beautifygraph.t
 test-glog-topological.t
 test-glog.t
--- a/tests/test-globalopts.t	Sat Oct 13 04:42:14 2018 +0300
+++ b/tests/test-globalopts.t	Sat Oct 13 04:47:51 2018 +0300
@@ -267,6 +267,7 @@
 #if no-chg
   $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'
   Traceback (most recent call last):
+  Traceback (most recent call last): (py3k !)
 #else
 Traceback for '--config' errors not supported with chg.
   $ hg --cwd c --config x --traceback id 2>&1 | grep -i 'traceback'