Fix index tests.

diff --git a/dulwich/index.py b/dulwich/index.py
index 3f89e312f6a0493ce0e1fcb58fce48fa6d369ce8..bfc90d6bfcd346a620c12ce5d32f732f3960d729 100644 (file)
--- a/dulwich/index.py
+++ b/dulwich/index.py
@@ -132,7 +132,6 @@ class Index(object):
         f = open(self._filename, 'r')
         try:
             for x in read_index(f):
-
                 self[x[0]] = tuple(x[1:])
         finally:
             f.close()
@@ -143,6 +142,9 @@ class Index(object):
     def __getitem__(self, name):
         return self._byname[name]
 
+    def __iter__(self):
+        return iter(self._byname)
+
     def get_sha1(self, path):
         return self[path][-2]
 

diff --git a/dulwich/tests/test_index.py b/dulwich/tests/test_index.py
index ff5f855958d343604d3cf46f506527c5cae3b880..da06438ffbec813de6f3ad939412612c9126db99 100644 (file)
--- a/dulwich/tests/test_index.py
+++ b/dulwich/tests/test_index.py
@@ -39,13 +39,10 @@ class SimpleIndexTestcase(IndexTestCase):
         self.assertEquals(1, len(self.get_simple_index("index")))
 
     def test_iter(self):
-        self.assertEquals([
-            ('bla', (1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, '\xe6\x9d\xe2\x9b\xb2\xd1\xd6CK\x8b)\xaewZ\xd8\xc2\xe4\x8cS\x91', 3)
-            ], 
-                list(self.get_simple_index("index")))
+        self.assertEquals(['bla'], list(self.get_simple_index("index")))
 
     def test_getitem(self):
-        self.assertEquals( ('bla', (1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, '\xe6\x9d\xe2\x9b\xb2\xd1\xd6CK\x8b)\xaewZ\xd8\xc2\xe4\x8cS\x91', 3)
+        self.assertEquals( ((1230680220, 0), (1230680220, 0), 2050, 3761020, 33188, 1000, 1000, 0, '\xe6\x9d\xe2\x9b\xb2\xd1\xd6CK\x8b)\xaewZ\xd8\xc2\xe4\x8cS\x91', 3)
             , 
                 self.get_simple_index("index")["bla"])