Use self.store rather than explicitly creating a DiskObjectStore.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 28 Jun 2010 22:48:54 +0000 (00:48 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 28 Jun 2010 22:48:54 +0000 (00:48 +0200)
dulwich/object_store.py
dulwich/tests/test_object_store.py

index ed8d4ac9a9433e5b543f53b9c2065d2829de8113..32f9b78503fca06523f1b685a25a911962f14468 100644 (file)
@@ -53,6 +53,7 @@ from dulwich.pack import (
     write_pack_index_v2,
     )
 
+INFODIR = 'info'
 PACKDIR = 'pack'
 
 
index 1e1f91c9b3d240a1cd74a746d24c0118e43f90e3..15241bae88d196d153142047af6d24810474c786 100644 (file)
@@ -86,19 +86,17 @@ class MemoryObjectStoreTests(ObjectStoreTests, TestCase):
 class PackBasedObjectStoreTests(ObjectStoreTests):
 
     def test_empty_packs(self):
-        o = DiskObjectStore(self.store_dir)
-        self.assertEquals([], o.packs)
+        self.assertEquals([], self.store.packs)
 
     def test_pack_loose_objects(self):
-        o = DiskObjectStore(self.store_dir)
         b1 = make_object(Blob, data="yummy data")
-        o.add_object(b1)
+        self.store.add_object(b1)
         b2 = make_object(Blob, data="more yummy data")
-        o.add_object(b2)
-        self.assertEquals([], o.packs)
-        self.assertEquals(2, o.pack_loose_objects())
-        self.assertNotEquals([], o.packs)
-        self.assertEquals(0, o.pack_loose_objects())
+        self.store.add_object(b2)
+        self.assertEquals([], self.store.packs)
+        self.assertEquals(2, self.store.pack_loose_objects())
+        self.assertNotEquals([], self.store.packs)
+        self.assertEquals(0, self.store.pack_loose_objects())
 
 
 class DiskObjectStoreTests(PackBasedObjectStoreTests, TestCase):