test-concurrency: Explicitly use floor division
authorSimon McVittie <smcv@debian.org>
Wed, 17 Jan 2018 15:03:59 +0000 (15:03 +0000)
committerSimon McVittie <smcv@debian.org>
Wed, 17 Jan 2018 15:34:46 +0000 (15:34 +0000)
Python 3 is pickier about this. Python 2.7 has Python 3-compatible
semantics for division when the division feature is imported from the
future.

Signed-off-by: Simon McVittie <smcv@debian.org>
Gbp-Pq: Name test-concurrency-Explicitly-use-floor-division.patch

tests/test-concurrency.py

index f16f696b57c4a25a5d29c9a25d192d64c95a3416..3a0ce10336f373845761d09c4710f7bacc571d4a 100755 (executable)
@@ -17,6 +17,7 @@
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
+from __future__ import division
 from __future__ import print_function
 import os
 import sys
@@ -78,12 +79,12 @@ def run(n_committers, n_pruners):
     pruners = set()
 
     print('n_committers', n_committers, 'n_pruners', n_pruners, file=sys.stderr)
-    n_trees = n_committers / 2
+    n_trees = n_committers // 2
     for v in range(n_trees):
         mktree('tree{}'.format(v))
 
     for v in range(n_committers):
-        committers.add(commit(v / 2))
+        committers.add(commit(v // 2))
     for v in range(n_pruners):
         pruners.add(prune())
 
@@ -101,8 +102,8 @@ def run(n_committers, n_pruners):
         shutil.rmtree('tree{}'.format(v))
 
 # No concurrent pruning
-run(cpu_count()/2 + 2, 0)
+run(cpu_count() // 2 + 2, 0)
 print("ok no concurrent prunes")
 
-run(cpu_count()/2 + 4, 3)
+run(cpu_count() // 2 + 4, 3)
 print("ok concurrent prunes")