[PATCH] run-tests: endswith takes bytes as argument in python3, not str

matthieu.laneuville at octobus.net matthieu.laneuville at octobus.net
Fri Nov 3 12:19:40 UTC 2017


# HG changeset patch
# User Matthieu Laneuville <matthieu.laneuville at octobus.net>
# Date 1509711297 -32400
#      Fri Nov 03 21:14:57 2017 +0900
# Node ID 25d1eb7275ba4b95fbb4240672a3ad6578ab5b87
# Parent  7ebf850d3166a64ff33b4b85adb481b533ddbf86
run-tests: endswith takes bytes as argument in python3, not str

diff -r 7ebf850d3166 -r 25d1eb7275ba tests/run-tests.py
--- a/tests/run-tests.py	Sat Oct 21 16:50:57 2017 +0900
+++ b/tests/run-tests.py	Fri Nov 03 21:14:57 2017 +0900
@@ -2356,8 +2356,8 @@ class TestRunner(object):
         # assume all tests in same folder for now
         if testdescs:
             pathname = os.path.dirname(testdescs[0]['path'])
-            if pathname and not osenvironb[b'TESTDIR'].endswith('/'):
-                osenvironb[b'TESTDIR'] += '/'
+            if pathname and not osenvironb[b'TESTDIR'].endswith(b'/'):
+                osenvironb[b'TESTDIR'] += b'/'
             osenvironb[b'TESTDIR'] += pathname
         if self.options.outputdir:
             self._outputdir = canonpath(_bytespath(self.options.outputdir))


More information about the Mercurial-devel mailing list