Patchwork D3351: py3: fix test-shelve.t on Python 3

login
register
mail settings
Submitter phabricator
Date April 16, 2018, 11:21 p.m.
Message ID <fb2a494a5ed0eafa90b3dd072bde465c@localhost.localdomain>
Download mbox | patch
Permalink /patch/31134/
State Not Applicable
Headers show

Comments

phabricator - April 16, 2018, 11:21 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG89d82d2b68e9: py3: fix test-shelve.t on Python 3 (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D3351?vs=8314&id=8344

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

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

CHANGE DETAILS




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

Patch

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