D9009: py3: fix bytes and str mixup in run-tests

Submitter	phabricator
Date	Sept. 11, 2020, 7:42 a.m.
Message ID	<differential-rev-PHID-DREV-hlryhynfq4f4gsbfhdcr-req@mercurial-scm.org>
Download	mbox \| patch
Permalink	/patch/47137/
State	Superseded
Headers	show Return-Path: <mercurial-devel-bounces@mercurial-scm.org> Date: Fri, 11 Sep 2020 07:42:49 +0000 To: Phabricator <phabricator@mercurial-scm.org> From: "khanchi97 (Sushil khanchi)" <phabricator@mercurial-scm.org> Subject: D9009: py3: fix bytes and str mixup in run-tests Message-ID: <differential-rev-PHID-DREV-hlryhynfq4f4gsbfhdcr-req@mercurial-scm.org> Precedence: bulk Thread-Topic: PHID-DREV-hlryhynfq4f4gsbfhdcr Thread-Index: NGM0ZGE0N2ZkYjI0MjgwMmE2MTdiZTcyMGIx MIME-Version: 1.0 Cc: mercurial-devel@mercurial-scm.org Reply-To: "khanchi97 \(Sushil khanchi\)" <phabricator+D9009+public+5da826fa6c578bd2@mercurial-scm.org> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: mercurial-devel-bounces@mercurial-scm.org Sender: "Mercurial-devel" <mercurial-devel-bounces@mercurial-scm.org>

Comments

phabricator - Sept. 11, 2020, 7:42 a.m.

khanchi97 created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  tests/run-tests.py

CHANGE DETAILS




To: khanchi97, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/tests/run-tests.py b/tests/run-tests.py
--- a/tests/run-tests.py
+++ b/tests/run-tests.py
@@ -3347,7 +3347,8 @@ 
         else:
             errpath = b'%s.err' % test['path']
         if self.options.outputdir:
-            errpath = os.path.join(self.options.outputdir, errpath)
+            self._outputdir = canonpath(_sys2bytes(self.options.outputdir))
+            errpath = os.path.join(self._outputdir, errpath)
         return errpath
 
     def _getport(self, count):

Patchwork D9009: py3: fix bytes and str mixup in run-tests

Comments

Patch