Mercurial > hg-stable
changeset 40278:125fc478719f
py3: fix test-status.t
Differential Revision: https://phab.mercurial-scm.org/D5089
| author | Mark Thomas <mbthomas@fb.com> |
|---|---|
| date | Sat, 13 Oct 2018 15:32:52 +0000 |
| parents | 1159031ada1e |
| children | 4821affc154f |
| files | contrib/python3-whitelist tests/test-status.t |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/python3-whitelist Sun Oct 14 07:25:01 2018 +0200 +++ b/contrib/python3-whitelist Sat Oct 13 15:32:52 2018 +0000 @@ -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
--- a/tests/test-status.t Sun Oct 14 07:25:01 2018 +0200 +++ b/tests/test-status.t Sat Oct 13 15:32:52 2018 +0000 @@ -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