52 lines
1.6 KiB
Diff
52 lines
1.6 KiB
Diff
From: Simon McVittie <smcv@debian.org>
|
|
Date: Wed, 17 Jan 2018 14:42:20 +0000
|
|
Subject: test-concurrency: Replace range with xrange
|
|
|
|
range in Python 3 does what xrange did in Python 2. This still works in
|
|
Python 2, it just uses a bit more memory.
|
|
|
|
Signed-off-by: Simon McVittie <smcv@debian.org>
|
|
Applied-upstream: 2018.3, commit:02dc5e2dd47d1be0eb73d2f7e5b588f04c572390
|
|
---
|
|
tests/test-concurrency.py | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/tests/test-concurrency.py b/tests/test-concurrency.py
|
|
index 6fade24..f16f696 100755
|
|
--- a/tests/test-concurrency.py
|
|
+++ b/tests/test-concurrency.py
|
|
@@ -34,7 +34,7 @@ def fatal(msg):
|
|
def mktree(dname, serial=0):
|
|
print('Creating tree', dname, file=sys.stderr)
|
|
os.mkdir(dname, 0o755)
|
|
- for v in xrange(20):
|
|
+ for v in range(20):
|
|
with open('{}/{}'.format(dname, v), 'w') as f:
|
|
f.write('{} {} {}\n'.format(dname, serial, v))
|
|
|
|
@@ -79,12 +79,12 @@ def run(n_committers, n_pruners):
|
|
|
|
print('n_committers', n_committers, 'n_pruners', n_pruners, file=sys.stderr)
|
|
n_trees = n_committers / 2
|
|
- for v in xrange(n_trees):
|
|
+ for v in range(n_trees):
|
|
mktree('tree{}'.format(v))
|
|
|
|
- for v in xrange(n_committers):
|
|
+ for v in range(n_committers):
|
|
committers.add(commit(v / 2))
|
|
- for v in xrange(n_pruners):
|
|
+ for v in range(n_pruners):
|
|
pruners.add(prune())
|
|
|
|
failed = False
|
|
@@ -97,7 +97,7 @@ def run(n_committers, n_pruners):
|
|
if failed:
|
|
fatal('A child process exited abnormally')
|
|
|
|
- for v in xrange(n_trees):
|
|
+ for v in range(n_trees):
|
|
shutil.rmtree('tree{}'.format(v))
|
|
|
|
# No concurrent pruning
|