comparison tests/run-tests.py @ 45442:c6e332a451d0

py3: fix bytes and str mixup in run-tests Differential Revision: https://phab.mercurial-scm.org/D9009
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Fri, 11 Sep 2020 13:04:05 +0530
parents 543e446204c6
children 22140fd783d2
comparison
equal deleted inserted replaced
45441:3d9f1dfc52c2 45442:c6e332a451d0
3345 casestr = b'#'.join(test['case']) 3345 casestr = b'#'.join(test['case'])
3346 errpath = b'%s#%s.err' % (test['path'], casestr) 3346 errpath = b'%s#%s.err' % (test['path'], casestr)
3347 else: 3347 else:
3348 errpath = b'%s.err' % test['path'] 3348 errpath = b'%s.err' % test['path']
3349 if self.options.outputdir: 3349 if self.options.outputdir:
3350 errpath = os.path.join(self.options.outputdir, errpath) 3350 self._outputdir = canonpath(_sys2bytes(self.options.outputdir))
3351 errpath = os.path.join(self._outputdir, errpath)
3351 return errpath 3352 return errpath
3352 3353
3353 def _getport(self, count): 3354 def _getport(self, count):
3354 port = self._ports.get(count) # do we have a cached entry? 3355 port = self._ports.get(count) # do we have a cached entry?
3355 if port is None: 3356 if port is None: