Some style fixes and size-calculation fixes. Also do the small-memory run

using a prime number, rather than a convenient power-of-2-and-multiple-of-5,
so incorrect testing algorithms fail more easily.

diff --git a/Lib/test/test_bigmem.py b/Lib/test/test_bigmem.py
index 99297cfd6431bb8c6ac6102db86d499795bb3ddc..f685d14edd3289a32a63fec91979e14ae7fb536c 100644 (file)
--- a/Lib/test/test_bigmem.py
+++ b/Lib/test/test_bigmem.py
@@ -417,7 +417,7 @@ class StrTest(unittest.TestCase):
         self.failUnless(sf.endswith('-..'))\r
         del s, sf\r
 \r
-        size = (size // 2)\r
+        size //= 2\r
         edge = '-' * size\r
         s = ''.join([edge, '%s', edge])\r
         del edge\r
@@ -591,7 +591,7 @@ class TupleTest(unittest.TestCase):
     def test_concat_large(self, size):\r
         return self.basic_concat_test(size)\r
 \r
-    @bigmemtest(minsize=_2G // 5 + 10, memuse=8*5)\r
+    @bigmemtest(minsize=_2G // 5 + 10, memuse=8 * 5)\r
     def test_contains(self, size):\r
         t = (1, 2, 3, 4, 5) * size\r
         self.assertEquals(len(t), size * 5)\r
@@ -650,11 +650,11 @@ class TupleTest(unittest.TestCase):
         self.assertEquals(s[-5:], '0, 0)')\r
         self.assertEquals(s.count('0'), size)\r
 \r
-    @bigmemtest(minsize=_2G // 3 + 2, memuse=8+3)\r
+    @bigmemtest(minsize=_2G // 3 + 2, memuse=8 + 3)\r
     def test_repr_small(self, size):\r
         return self.basic_test_repr(size)\r
 \r
-    @bigmemtest(minsize=_2G + 2, memuse=8+3)\r
+    @bigmemtest(minsize=_2G + 2, memuse=8 + 3)\r
     def test_repr_large(self, size):\r
         return self.basic_test_repr(size)\r
 \r
@@ -711,7 +711,7 @@ class ListTest(unittest.TestCase):
     def test_inplace_concat_large(self, size):\r
         return self.basic_test_inplace_concat(size)\r
 \r
-    @bigmemtest(minsize=_2G // 5 + 10, memuse=8*5)\r
+    @bigmemtest(minsize=_2G // 5 + 10, memuse=8 * 5)\r
     def test_contains(self, size):\r
         l = [1, 2, 3, 4, 5] * size\r
         self.assertEquals(len(l), size * 5)\r
@@ -864,9 +864,10 @@ class ListTest(unittest.TestCase):
     def test_extend_large(self, size):\r
         return self.basic_test_extend(size)\r
 \r
-    @bigmemtest(minsize=_2G + 10, memuse=8)\r
+    @bigmemtest(minsize=_2G // 5 + 2, memuse=8 * 5)\r
     def test_index(self, size):\r
-        l = [1L, 2L, 3L, 4L, 5L] * (size // 5)\r
+        l = [1L, 2L, 3L, 4L, 5L] * size\r
+        size *= 5\r
         self.assertEquals(l.index(1), 0)\r
         self.assertEquals(l.index(5, size - 5), size - 1)\r
         self.assertEquals(l.index(5, size - 5, size), size - 1)\r
@@ -893,25 +894,29 @@ class ListTest(unittest.TestCase):
         self.assertEquals(l[:3], [1.0, "C", 1.0])\r
         self.assertEquals(l[size - 3:], ["A", 1.0, "B"])\r
 \r
-    @bigmemtest(minsize=_2G + 20, memuse=8)\r
+    @bigmemtest(minsize=_2G // 5 + 4, memuse=8 * 5)\r
     def test_pop(self, size):\r
-        l = [u"a", u"b", u"c", u"d", u"e"] * (size // 5)\r
+        l = [u"a", u"b", u"c", u"d", u"e"] * size\r
+        size *= 5\r
         self.assertEquals(len(l), size)\r
 \r
         item = l.pop()\r
         size -= 1\r
         self.assertEquals(len(l), size)\r
         self.assertEquals(item, u"e")\r
+        self.assertEquals(l[-2:], [u"c", u"d"])\r
 \r
         item = l.pop(0)\r
         size -= 1\r
         self.assertEquals(len(l), size)\r
         self.assertEquals(item, u"a")\r
+        self.assertEquals(l[:2], [u"b", u"c"])\r
 \r
         item = l.pop(size - 2)\r
         size -= 1\r
         self.assertEquals(len(l), size)\r
         self.assertEquals(item, u"c")\r
+        self.assertEquals(l[-2:], [u"b", u"d"])\r
 \r
     @bigmemtest(minsize=_2G + 10, memuse=8)\r
     def test_remove(self, size):\r
@@ -933,20 +938,20 @@ class ListTest(unittest.TestCase):
         self.assertEquals(len(l), size)\r
         self.assertEquals(l[-2:], [10, 10])\r
 \r
-    @bigmemtest(minsize=_2G + 10, memuse=8)\r
+    @bigmemtest(minsize=_2G // 5 + 2, memuse=8 * 5)\r
     def test_reverse(self, size):\r
-        l = [1, 2, 3, 4, 5] * (size // 5)\r
+        l = [1, 2, 3, 4, 5] * size\r
         l.reverse()\r
-        self.assertEquals(len(l), size)\r
+        self.assertEquals(len(l), size * 5)\r
         self.assertEquals(l[-5:], [5, 4, 3, 2, 1])\r
         self.assertEquals(l[:5], [5, 4, 3, 2, 1])\r
 \r
-    @bigmemtest(minsize=_2G + 10, memuse=8)\r
+    @bigmemtest(minsize=_2G // 5 + 2, memuse=8 * 5)\r
     def test_sort(self, size):\r
-        l = [1, 2, 3, 4, 5] * (size // 5)\r
+        l = [1, 2, 3, 4, 5] * size\r
         l.sort()\r
-        self.assertEquals(len(l), size)\r
-        self.assertEquals(l.count(1), size // 5)\r
+        self.assertEquals(len(l), size * 5)\r
+        self.assertEquals(l.count(1), size)\r
         self.assertEquals(l[:10], [1] * 10)\r
         self.assertEquals(l[-10:], [5] * 10)\r
 \r