D5089: py3: fix test-status.t

[mbthomas (Mark Thomas)]

mbthomas updated this revision to Diff 12098.
mbthomas added a comment.
Herald added a reviewer: pulkit.


  Add to whitelist

REPOSITORY
  rHG Mercurial

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

BRANCH
  default

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
@@ -528,7 +537,7 @@
 
   $ hg status --config ui.formatdebug=True --rev 1 1
   status = [
-      {*'path': '1/2/3/4/5/b.txt'*}, (glob)
+      {*'path': *'1/2/3/4/5/b.txt'*}, (glob)
   ]
 
 #if windows
diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -529,6 +529,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: mercurial-devel