comparison tests/run-tests.py @ 49285:56f98406831b

py3: remove xrange() compatibility code Some code used its own xrange() compatibility code instead of pycompat.xrange().
author Manuel Jacob <me@manueljacob.de>
date Sun, 29 May 2022 15:32:43 +0200
parents cd51d4957b28
children 53e9422a9b45
comparison
equal deleted inserted replaced
49284:d44e3c45f0e4 49285:56f98406831b
147 147
148 runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle) 148 runnerformatter = formatters.Terminal256Formatter(style=TestRunnerStyle)
149 runnerlexer = TestRunnerLexer() 149 runnerlexer = TestRunnerLexer()
150 150
151 origenviron = os.environ.copy() 151 origenviron = os.environ.copy()
152
153
154 xrange = range # we use xrange in one place, and we'd rather not use range
155 152
156 153
157 def _sys2bytes(p): 154 def _sys2bytes(p):
158 if p is None: 155 if p is None:
159 return p 156 return p
1420 env['USERPROFILE'] = env['HOME'] 1417 env['USERPROFILE'] = env['HOME']
1421 formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1]) 1418 formated_timeout = _bytes2sys(b"%d" % default_defaults['timeout'][1])
1422 env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout 1419 env['HGTEST_TIMEOUT_DEFAULT'] = formated_timeout
1423 env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout) 1420 env['HGTEST_TIMEOUT'] = _bytes2sys(b"%d" % self._timeout)
1424 # This number should match portneeded in _getport 1421 # This number should match portneeded in _getport
1425 for port in xrange(3): 1422 for port in range(3):
1426 # This list should be parallel to _portmap in _getreplacements 1423 # This list should be parallel to _portmap in _getreplacements
1427 defineport(port) 1424 defineport(port)
1428 env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc')) 1425 env["HGRCPATH"] = _bytes2sys(os.path.join(self._threadtmp, b'.hgrc'))
1429 env["DAEMON_PIDS"] = _bytes2sys( 1426 env["DAEMON_PIDS"] = _bytes2sys(
1430 os.path.join(self._threadtmp, b'daemon.pids') 1427 os.path.join(self._threadtmp, b'daemon.pids')
2501 ignored = True 2498 ignored = True
2502 break 2499 break
2503 2500
2504 if ignored: 2501 if ignored:
2505 continue 2502 continue
2506 for _ in xrange(self._runs_per_test): 2503 for _ in range(self._runs_per_test):
2507 tests.append(get()) 2504 tests.append(get())
2508 2505
2509 runtests = list(tests) 2506 runtests = list(tests)
2510 done = queue.Queue() 2507 done = queue.Queue()
2511 running = 0 2508 running = 0
2550 d += ' ' 2547 d += ' '
2551 d += ' ' 2548 d += ' '
2552 with iolock: 2549 with iolock:
2553 sys.stdout.write(d + ' ') 2550 sys.stdout.write(d + ' ')
2554 sys.stdout.flush() 2551 sys.stdout.flush()
2555 for x in xrange(10): 2552 for x in range(10):
2556 if channels: 2553 if channels:
2557 time.sleep(0.1) 2554 time.sleep(0.1)
2558 count += 1 2555 count += 1
2559 2556
2560 stoppedearly = False 2557 stoppedearly = False
3500 def _getport(self, count): 3497 def _getport(self, count):
3501 port = self._ports.get(count) # do we have a cached entry? 3498 port = self._ports.get(count) # do we have a cached entry?
3502 if port is None: 3499 if port is None:
3503 portneeded = 3 3500 portneeded = 3
3504 # above 100 tries we just give up and let test reports failure 3501 # above 100 tries we just give up and let test reports failure
3505 for tries in xrange(100): 3502 for tries in range(100):
3506 allfree = True 3503 allfree = True
3507 port = self.options.port + self._portoffset 3504 port = self.options.port + self._portoffset
3508 for idx in xrange(portneeded): 3505 for idx in range(portneeded):
3509 if not checkportisavailable(port + idx): 3506 if not checkportisavailable(port + idx):
3510 allfree = False 3507 allfree = False
3511 break 3508 break
3512 self._portoffset += portneeded 3509 self._portoffset += portneeded
3513 if allfree: 3510 if allfree: