tests: glob away some annoying py3 differences
authorAugie Fackler <augie@google.com>
Fri, 12 Oct 2018 10:01:09 -0400
changeset 40184 c3b7d9c54edd
parent 40183 0173ed47a873
child 40185 19fc5a986669
tests: glob away some annoying py3 differences Differential Revision: https://phab.mercurial-scm.org/D4994
tests/test-extension.t
--- a/tests/test-extension.t	Fri Oct 12 10:00:43 2018 -0400
+++ b/tests/test-extension.t	Fri Oct 12 10:01:09 2018 -0400
@@ -567,8 +567,8 @@
       uisetup(ui)
     File "$TESTTMP/baduisetup.py", line 2, in uisetup
       1/0
-  ZeroDivisionError: integer division or modulo by zero
-  *** failed to set up extension baduisetup: integer division or modulo by zero
+  ZeroDivisionError: * by zero (glob)
+  *** failed to set up extension baduisetup: * by zero (glob)
   Mercurial Distributed SCM (version *) (glob)
   (see https://mercurial-scm.org for more information)
   
@@ -1772,7 +1772,7 @@
   > test_unicode_default_value = $TESTTMP/test_unicode_default_value.py
   > EOF
   $ hg -R $TESTTMP/opt-unicode-default dummy
-  *** failed to import extension test_unicode_default_value from $TESTTMP/test_unicode_default_value.py: unicode u'value' found in cmdtable.dummy
+  *** failed to import extension test_unicode_default_value from $TESTTMP/test_unicode_default_value.py: unicode *'value' found in cmdtable.dummy (glob)
   *** (use b'' to make it byte string)
   hg: unknown command 'dummy'
   (did you mean summary?)