Mercurial > hg

changeset 37742:89d82d2b68e9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: fix test-shelve.t on Python 3 We get a better error message out of the abort here, which is fine. Differential Revision: https://phab.mercurial-scm.org/D3351
author Augie Fackler <augie@google.com>
date Fri, 13 Apr 2018 22:12:30 -0400
parents 700aaa19de63
children 25136e03012e
files contrib/python3-whitelist tests/test-shelve.t
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/contrib/python3-whitelist	Fri Apr 13 21:53:07 2018 -0400
+++ b/contrib/python3-whitelist	Fri Apr 13 22:12:30 2018 -0400
@@ -398,6 +398,7 @@
 test-serve.t
 test-setdiscovery.t
 test-share.t
+test-shelve.t
 test-show-stack.t
 test-show-work.t
 test-show.t
--- a/tests/test-shelve.t	Fri Apr 13 21:53:07 2018 -0400
+++ b/tests/test-shelve.t	Fri Apr 13 22:12:30 2018 -0400
@@ -1273,7 +1273,7 @@
   $ rm .hg/unshelverebasestate
   $ hg unshelve --abort
   unshelve of 'default' aborted
-  abort: $ENOENT$
+  abort: $ENOENT$* (glob)
   [255]
 Can the user leave the current state?
   $ hg up -C .