test/py: Use range() rather than xrange()

In python 3.x the xrange() function has been removed, and range()
returns an iterator much like Python 2.x's xrange(). Simply use range()
in place of xrange() in order to work on both python 2.x & 3.x. This
will mean a small cost on python 2.x since range() will return a list
there rather than an iterator, but the cost should be negligible.

Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
lime2-spi
Paul Burton 7 years ago committed by Simon Glass
parent dffd56d1d2
commit b8c455500a
  1. 2
      test/py/u_boot_console_sandbox.py
  2. 6
      test/py/u_boot_spawn.py
  3. 4
      test/py/u_boot_utils.py

@ -81,7 +81,7 @@ class ConsoleSandbox(ConsoleBase):
p = self.p p = self.p
self.p = None self.p = None
for i in xrange(100): for i in range(100):
ret = not p.isalive() ret = not p.isalive()
if ret: if ret:
break break

@ -134,7 +134,7 @@ class Spawn(object):
the expected time. the expected time.
""" """
for pi in xrange(len(patterns)): for pi in range(len(patterns)):
if type(patterns[pi]) == type(''): if type(patterns[pi]) == type(''):
patterns[pi] = re.compile(patterns[pi]) patterns[pi] = re.compile(patterns[pi])
@ -143,7 +143,7 @@ class Spawn(object):
while True: while True:
earliest_m = None earliest_m = None
earliest_pi = None earliest_pi = None
for pi in xrange(len(patterns)): for pi in range(len(patterns)):
pattern = patterns[pi] pattern = patterns[pi]
m = pattern.search(self.buf) m = pattern.search(self.buf)
if not m: if not m:
@ -198,7 +198,7 @@ class Spawn(object):
""" """
os.close(self.fd) os.close(self.fd)
for i in xrange(100): for i in range(100):
if not self.isalive(): if not self.isalive():
break break
time.sleep(0.1) time.sleep(0.1)

@ -120,7 +120,7 @@ def wait_until_open_succeeds(fn):
An open file handle to the file. An open file handle to the file.
""" """
for i in xrange(100): for i in range(100):
fh = attempt_to_open_file(fn) fh = attempt_to_open_file(fn)
if fh: if fh:
return fh return fh
@ -143,7 +143,7 @@ def wait_until_file_open_fails(fn, ignore_errors):
Nothing. Nothing.
""" """
for i in xrange(100): for i in range(100):
fh = attempt_to_open_file(fn) fh = attempt_to_open_file(fn)
if not fh: if not fh:
return return

Loading…
Cancel
Save