D5089: py3: fix test-status.t

mbthomas (Mark Thomas) phabricator at mercurial-scm.org
Sun Oct 14 08:07:14 UTC 2018


This revision was automatically updated to reflect the committed changes.
Closed by commit rHG125fc478719f: py3: fix test-status.t (authored by mbthomas, committed by ).

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D5089?vs=12098&id=12101#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5089?vs=12098&id=12101

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

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

CHANGE DETAILS

diff --git a/tests/test-status.t b/tests/test-status.t
--- a/tests/test-status.t
+++ b/tests/test-status.t
@@ -272,8 +272,17 @@
   $ hg status -A -Tpickle > pickle
   >>> from __future__ import print_function
   >>> import pickle
-  >>> print(sorted((x['status'], x['path']) for x in pickle.load(open("pickle"))))
-  [('!', 'deleted'), ('?', 'pickle'), ('?', 'unknown'), ('A', 'added'), ('A', 'copied'), ('C', '.hgignore'), ('C', 'modified'), ('I', 'ignored'), ('R', 'removed')]
+  >>> data = sorted((x[b'status'].decode(), x[b'path'].decode()) for x in pickle.load(open("pickle", r"rb")))
+  >>> for s, p in data: print("%s %s" % (s, p))
+  ! deleted
+  ? pickle
+  ? unknown
+  A added
+  A copied
+  C .hgignore
+  C modified
+  I ignored
+  R removed
   $ rm pickle
 
   $ echo "^ignoreddir$" > .hgignore
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -563,6 +563,7 @@
 test-status-inprocess.py
 test-status-rev.t
 test-status-terse.t
+test-status.t
 test-storage.py
 test-stream-bundle-v2.t
 test-strict.t



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


More information about the Mercurial-devel mailing list