##// END OF EJS Templates
tests: fix bytes/str issues in run-tests.py caught by python3...
Augie Fackler -
r38969:35180ade default
parent child Browse files
Show More
@@ -1247,8 +1247,8 b' class TTest(Test):'
1247 self._allcases = {x for y in parsettestcases(path) for x in y}
1247 self._allcases = {x for y in parsettestcases(path) for x in y}
1248 super(TTest, self).__init__(path, *args, **kwds)
1248 super(TTest, self).__init__(path, *args, **kwds)
1249 if case:
1249 if case:
1250 casepath = _strpath('#'.join(case))
1250 casepath = b'#'.join(case)
1251 self.name = '%s#%s' % (self.name, casepath)
1251 self.name = '%s#%s' % (self.name, _strpath(casepath))
1252 self.errpath = b'%s#%s.err' % (self.errpath[:-4], casepath)
1252 self.errpath = b'%s#%s.err' % (self.errpath[:-4], casepath)
1253 self._tmpname += b'-%s' % casepath
1253 self._tmpname += b'-%s' % casepath
1254 self._have = {}
1254 self._have = {}
@@ -1371,7 +1371,7 b' class TTest(Test):'
1371 if os.getenv('MSYSTEM'):
1371 if os.getenv('MSYSTEM'):
1372 script.append(b'alias pwd="pwd -W"\n')
1372 script.append(b'alias pwd="pwd -W"\n')
1373 if self._case:
1373 if self._case:
1374 casestr = '#'.join(self._case)
1374 casestr = b'#'.join(self._case)
1375 if isinstance(self._case, str):
1375 if isinstance(self._case, str):
1376 quoted = shellquote(casestr)
1376 quoted = shellquote(casestr)
1377 else:
1377 else:
@@ -2680,7 +2680,7 b' class TestRunner(object):'
2680 if m is not None:
2680 if m is not None:
2681 t, _, casestr = m.groups()
2681 t, _, casestr = m.groups()
2682 if casestr:
2682 if casestr:
2683 case = casestr.split('#')
2683 case = casestr.split(b'#')
2684 else:
2684 else:
2685 continue
2685 continue
2686
2686
@@ -2726,7 +2726,7 b' class TestRunner(object):'
2726 desc = testdescs[0]
2726 desc = testdescs[0]
2727 # desc['path'] is a relative path
2727 # desc['path'] is a relative path
2728 if 'case' in desc:
2728 if 'case' in desc:
2729 casestr = '#'.join(desc['case'])
2729 casestr = b'#'.join(desc['case'])
2730 errpath = b'%s#%s.err' % (desc['path'], casestr)
2730 errpath = b'%s#%s.err' % (desc['path'], casestr)
2731 else:
2731 else:
2732 errpath = b'%s.err' % desc['path']
2732 errpath = b'%s.err' % desc['path']
General Comments 0
You need to be logged in to leave comments. Login now