D5035: py3: add some py3 specific output to test

pulkit (Pulkit Goyal) phabricator at mercurial-scm.org
Sat Oct 13 01:59:14 UTC 2018


pulkit created this revision.
Herald added subscribers: mercurial-devel, mjpieters.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  This makes the test work on Python 3.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  contrib/python3-whitelist
  tests/test-globalopts.t

CHANGE DETAILS

diff --git a/tests/test-globalopts.t b/tests/test-globalopts.t
--- a/tests/test-globalopts.t
+++ b/tests/test-globalopts.t
@@ -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'
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -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



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


More information about the Mercurial-devel mailing list