py3: more globing of things to make output compatible between py2 and py3
authorPulkit Goyal <pulkit@yandex-team.ru>
Sat, 13 Oct 2018 05:03:24 +0300
changeset 40227 f4893b59230f
parent 40226 0d403e9f049a
child 40228 a17c07793dcd
py3: more globing of things to make output compatible between py2 and py3 This also makes the test-ssh-repoerror.t pass on Python 3. Differential Revision: https://phab.mercurial-scm.org/D5038
contrib/python3-whitelist
tests/test-ssh-repoerror.t
--- a/contrib/python3-whitelist	Sat Oct 13 04:54:35 2018 +0300
+++ b/contrib/python3-whitelist	Sat Oct 13 05:03:24 2018 +0300
@@ -533,6 +533,7 @@
 test-ssh-clone-r.t
 test-ssh-proto-unbundle.t
 test-ssh-proto.t
+test-ssh-repoerror.t
 test-ssh.t
 test-sshserver.py
 test-stack.t
--- a/tests/test-ssh-repoerror.t	Sat Oct 13 04:54:35 2018 +0300
+++ b/tests/test-ssh-repoerror.t	Sat Oct 13 05:03:24 2018 +0300
@@ -16,7 +16,7 @@
   $ chmod a-rx no-read
 
   $ hg id ssh://user@dummy/no-read
-  remote: abort: Permission denied: '$TESTTMP/no-read/.hg'
+  remote: abort: Permission denied: *$TESTTMP/no-read/.hg* (glob)
   abort: no suitable response from remote hg!
   [255]
 
@@ -50,7 +50,7 @@
   $ chmod a-rx deep
 
   $ hg id ssh://user@dummy/deep/nested
-  remote: abort: Permission denied: '$TESTTMP/deep/nested/.hg'
+  remote: abort: Permission denied: *$TESTTMP/deep/nested/.hg* (glob)
   abort: no suitable response from remote hg!
   [255]