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