Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix up a couple of minor bytes inconsistencies in run-tests.py
authorAugie Fackler <augie@google.com>
Fri, 13 Apr 2018 21:53:07 -0400
changeset 37741 700aaa19de63
parent 37740 1b71a397d6b2
child 37742 89d82d2b68e9
tests: fix up a couple of minor bytes inconsistencies in run-tests.py Only in the automatic bisection code, so fortunately nothing major is amiss. Fixes test-run-tests.t under Python 3. Differential Revision: https://phab.mercurial-scm.org/D3350
contrib/python3-whitelist file | annotate | diff | comparison | revisions
tests/run-tests.py file | annotate | diff | comparison | revisions 
--- a/contrib/python3-whitelist	Fri Apr 13 21:51:10 2018 -0400
+++ b/contrib/python3-whitelist	Fri Apr 13 21:53:07 2018 -0400
@@ -393,6 +393,7 @@
 test-revset-outgoing.t
 test-rollback.t
 test-run-tests.py
+test-run-tests.t
 test-schemes.t
 test-serve.t
 test-setdiscovery.t
--- a/tests/run-tests.py	Fri Apr 13 21:51:10 2018 -0400
+++ b/tests/run-tests.py	Fri Apr 13 21:53:07 2018 -0400
@@ -2215,10 +2215,11 @@
                     'Failed to identify failure point for %s' % test)
                 continue
             dat = m.groupdict()
-            verb = 'broken' if dat['goodbad'] == 'bad' else 'fixed'
+            verb = 'broken' if dat['goodbad'] == b'bad' else 'fixed'
             self.stream.writeln(
                 '%s %s by %s (%s)' % (
-                    test, verb, dat['node'], dat['summary']))
+                    test, verb, dat['node'].decode('ascii'),
+                    dat['summary'].decode('utf8', 'ignore')))
 
     def printtimes(self, times):
         # iolock held by run
mercurial