D1883: tests: get run-tests to reliably hand shellquote a string and not a bytes

durin42 (Augie Fackler) phabricator at mercurial-scm.org
Thu Feb 1 20:05:15 UTC 2018


durin42 updated this revision to Diff 5039.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1883?vs=4873&id=5039

REVISION DETAIL
  https://phab.mercurial-scm.org/D1883

AFFECTED FILES
  tests/run-tests.py

CHANGE DETAILS

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -1341,7 +1341,11 @@
         if os.getenv('MSYSTEM'):
             script.append(b'alias pwd="pwd -W"\n')
         if self._case:
-            script.append(b'TESTCASE=%s\n' % shellquote(self._case))
+            if isinstance(self._case, str):
+                quoted = shellquote(self._case)
+            else:
+                quoted = shellquote(self._case.decode('utf8')).encode('utf8')
+            script.append(b'TESTCASE=%s\n' % quoted)
             script.append(b'export TESTCASE\n')
 
         n = 0



To: durin42, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list