From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 8 May 2010 16:51:40 +0000 (+0000)
Subject: Merged revisions 80991 via svnmerge from
X-Git-Tag: v2.6.6rc1~345
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=614813941dcb3846af93faa1f69731158e2d4c90;p=python

Merged revisions 80991 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r80991 | benjamin.peterson | 2010-05-08 11:44:52 -0500 (Sat, 08 May 2010) | 1 line

  run and fix enumerate start test cases #8636
........
---

diff --git a/Lib/test/test_enumerate.py b/Lib/test/test_enumerate.py
index 074179cfe0..7aae7c02f9 100644
--- a/Lib/test/test_enumerate.py
+++ b/Lib/test/test_enumerate.py
@@ -199,26 +199,31 @@ class TestReversed(unittest.TestCase):
         self.assertEqual(rc, sys.getrefcount(r))
 
 
-class TestStart(EnumerateTestCase):
+class EnumerateStartTestCase(EnumerateTestCase):
 
-    enum = lambda i: enumerate(i, start=11)
-    seq, res = 'abc', [(1, 'a'), (2, 'b'), (3, 'c')]
+    def test_basicfunction(self):
+        e = self.enum(self.seq)
+        self.assertEqual(iter(e), e)
+        self.assertEqual(list(self.enum(self.seq)), self.res)
+
+
+class TestStart(EnumerateStartTestCase):
+
+    enum = lambda self, i: enumerate(i, start=11)
+    seq, res = 'abc', [(11, 'a'), (12, 'b'), (13, 'c')]
 
 
-class TestLongStart(EnumerateTestCase):
+class TestLongStart(EnumerateStartTestCase):
 
-    enum = lambda i: enumerate(i, start=sys.maxint+1)
+    enum = lambda self, i: enumerate(i, start=sys.maxint+1)
     seq, res = 'abc', [(sys.maxint+1,'a'), (sys.maxint+2,'b'),
                        (sys.maxint+3,'c')]
 
 
 def test_main(verbose=None):
-    testclasses = (EnumerateTestCase, SubclassTestCase, TestEmpty, TestBig,
-                   TestReversed)
-    test_support.run_unittest(*testclasses)
+    test_support.run_unittest(__name__)
 
     # verify reference counting
-    import sys
     if verbose and hasattr(sys, "gettotalrefcount"):
         counts = [None] * 5
         for i in xrange(len(counts)):