Merge Dave's fixes for the compatibility tests and web.
[jelmer/dulwich-libgit2.git] / dulwich / tests / test_pack.py
index d7802ac75f8364a4cfde83e18001b2feb22cc45c..1484ccb4663e6803daa9e4a09f7b0b5384ff9c86 100644 (file)
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
+
+"""Tests for Dulwich packs."""
+
+
+from cStringIO import StringIO
 import os
 import unittest
 
+from dulwich.objects import (
+    Tree,
+    )
 from dulwich.pack import (
-        PackIndex,
-        PackData,
-        hex_to_sha,
-        multi_ord,
-        write_pack_index_v1,
-        write_pack_index_v2,
-        write_pack,
-        )
+    Pack,
+    PackData,
+    apply_delta,
+    create_delta,
+    load_pack_index,
+    hex_to_sha,
+    read_zlib_chunks,
+    sha_to_hex,
+    write_pack_index_v1,
+    write_pack_index_v2,
+    write_pack,
+    )
 
 pack1_sha = 'bc63ddad95e7321ee734ea11a7a62d314e0d7481'
 
@@ -37,102 +49,205 @@ tree_sha = 'b2a2766a2879c209ab1176e7e778b81ae422eeaa'
 commit_sha = 'f18faa16531ac570a3fdc8c7ca16682548dafd12'
 
 class PackTests(unittest.TestCase):
-  """Base class for testing packs"""
-
-  datadir = os.path.join(os.path.dirname(__file__), 'data/packs')
-
-  def get_pack_index(self, sha):
-    """Returns a PackIndex from the datadir with the given sha"""
-    return PackIndex(os.path.join(self.datadir, 'pack-%s.idx' % sha))
-
-  def get_pack_data(self, sha):
-    """Returns a PackData object from the datadir with the given sha"""
-    return PackData(os.path.join(self.datadir, 'pack-%s.pack' % sha))
+    """Base class for testing packs"""
+  
+    datadir = os.path.join(os.path.dirname(__file__), 'data/packs')
+  
+    def get_pack_index(self, sha):
+        """Returns a PackIndex from the datadir with the given sha"""
+        return load_pack_index(os.path.join(self.datadir, 'pack-%s.idx' % sha))
+  
+    def get_pack_data(self, sha):
+        """Returns a PackData object from the datadir with the given sha"""
+        return PackData(os.path.join(self.datadir, 'pack-%s.pack' % sha))
+  
+    def get_pack(self, sha):
+        return Pack(os.path.join(self.datadir, 'pack-%s' % sha))
 
 
 class PackIndexTests(PackTests):
-  """Class that tests the index of packfiles"""
-
-  def test_object_index(self):
-    """Tests that the correct object offset is returned from the index."""
-    p = self.get_pack_index(pack1_sha)
-    self.assertEqual(p.object_index(pack1_sha), None)
-    self.assertEqual(p.object_index(a_sha), 178)
-    self.assertEqual(p.object_index(tree_sha), 138)
-    self.assertEqual(p.object_index(commit_sha), 12)
+    """Class that tests the index of packfiles"""
+  
+    def test_object_index(self):
+        """Tests that the correct object offset is returned from the index."""
+        p = self.get_pack_index(pack1_sha)
+        self.assertRaises(KeyError, p.object_index, pack1_sha)
+        self.assertEqual(p.object_index(a_sha), 178)
+        self.assertEqual(p.object_index(tree_sha), 138)
+        self.assertEqual(p.object_index(commit_sha), 12)
+  
+    def test_index_len(self):
+        p = self.get_pack_index(pack1_sha)
+        self.assertEquals(3, len(p))
+  
+    def test_get_stored_checksum(self):
+        p = self.get_pack_index(pack1_sha)
+        self.assertEquals("\xf2\x84\x8e*\xd1o2\x9a\xe1\xc9.;\x95\xe9\x18\x88\xda\xa5\xbd\x01", str(p.get_stored_checksum()))
+        self.assertEquals( 'r\x19\x80\xe8f\xaf\x9a_\x93\xadgAD\xe1E\x9b\x8b\xa3\xe7\xb7' , str(p.get_pack_checksum()))
+  
+    def test_index_check(self):
+        p = self.get_pack_index(pack1_sha)
+        self.assertEquals(True, p.check())
+  
+    def test_iterentries(self):
+        p = self.get_pack_index(pack1_sha)
+        self.assertEquals([('og\x0c\x0f\xb5?\x94cv\x0br\x95\xfb\xb8\x14\xe9e\xfb \xc8', 178, None), ('\xb2\xa2vj(y\xc2\t\xab\x11v\xe7\xe7x\xb8\x1a\xe4"\xee\xaa', 138, None), ('\xf1\x8f\xaa\x16S\x1a\xc5p\xa3\xfd\xc8\xc7\xca\x16h%H\xda\xfd\x12', 12, None)], list(p.iterentries()))
+  
+    def test_iter(self):
+        p = self.get_pack_index(pack1_sha)
+        self.assertEquals(set([tree_sha, commit_sha, a_sha]), set(p))
+  
+
+class TestPackDeltas(unittest.TestCase):
+  
+    test_string1 = "The answer was flailing in the wind"
+    test_string2 = "The answer was falling down the pipe"
+    test_string3 = "zzzzz"
+  
+    test_string_empty = ""
+    test_string_big = "Z" * 8192
+  
+    def _test_roundtrip(self, base, target):
+        self.assertEquals([target],
+            apply_delta(base, create_delta(base, target)))
+  
+    def test_nochange(self):
+        self._test_roundtrip(self.test_string1, self.test_string1)
+  
+    def test_change(self):
+        self._test_roundtrip(self.test_string1, self.test_string2)
+  
+    def test_rewrite(self):
+        self._test_roundtrip(self.test_string1, self.test_string3)
+  
+    def test_overflow(self):
+        self._test_roundtrip(self.test_string_empty, self.test_string_big)
 
 
 class TestPackData(PackTests):
-  """Tests getting the data from the packfile."""
-
-  def test_create_pack(self):
-    p = self.get_pack_data(pack1_sha)
-
-  def test_get_object_at(self):
-    """Tests random access for non-delta objects"""
-    p = self.get_pack_data(pack1_sha)
-    idx = self.get_pack_index(pack1_sha)
-    obj = p.get_object_at(idx.object_index(a_sha))
-    self.assertEqual(obj._type, 'blob')
-    self.assertEqual(obj.sha().hexdigest(), a_sha)
-    obj = p.get_object_at(idx.object_index(tree_sha))
-    self.assertEqual(obj._type, 'tree')
-    self.assertEqual(obj.sha().hexdigest(), tree_sha)
-    obj = p.get_object_at(idx.object_index(commit_sha))
-    self.assertEqual(obj._type, 'commit')
-    self.assertEqual(obj.sha().hexdigest(), commit_sha)
-
-  def test_pack_len(self):
-    p = self.get_pack_data(pack1_sha)
-    self.assertEquals(3, len(p))
-
-  def test_index_len(self):
-    p = self.get_pack_index(pack1_sha)
-    self.assertEquals(3, len(p))
-
-  def test_get_stored_checksum(self):
-    p = self.get_pack_index(pack1_sha)
-    self.assertEquals("\xf2\x84\x8e*\xd1o2\x9a\xe1\xc9.;\x95\xe9\x18\x88\xda\xa5\xbd\x01", str(p.get_stored_checksums()[1]))
-    self.assertEquals( 'r\x19\x80\xe8f\xaf\x9a_\x93\xadgAD\xe1E\x9b\x8b\xa3\xe7\xb7' , str(p.get_stored_checksums()[0]))
-
-  def test_check(self):
-    p = self.get_pack_index(pack1_sha)
-    self.assertEquals(True, p.check())
-
-  def test_iterentries(self):
-    p = self.get_pack_index(pack1_sha)
-    self.assertEquals([('og\x0c\x0f\xb5?\x94cv\x0br\x95\xfb\xb8\x14\xe9e\xfb \xc8', 178, None), ('\xb2\xa2vj(y\xc2\t\xab\x11v\xe7\xe7x\xb8\x1a\xe4"\xee\xaa', 138, None), ('\xf1\x8f\xaa\x16S\x1a\xc5p\xa3\xfd\xc8\xc7\xca\x16h%H\xda\xfd\x12', 12, None)], list(p.iterentries()))
+    """Tests getting the data from the packfile."""
+  
+    def test_create_pack(self):
+        p = self.get_pack_data(pack1_sha)
+  
+    def test_pack_len(self):
+        p = self.get_pack_data(pack1_sha)
+        self.assertEquals(3, len(p))
+  
+    def test_index_check(self):
+        p = self.get_pack_data(pack1_sha)
+        self.assertEquals(True, p.check())
+  
+    def test_iterobjects(self):
+        p = self.get_pack_data(pack1_sha)
+        self.assertEquals([(12, 1, 'tree b2a2766a2879c209ab1176e7e778b81ae422eeaa\nauthor James Westby <jw+debian@jameswestby.net> 1174945067 +0100\ncommitter James Westby <jw+debian@jameswestby.net> 1174945067 +0100\n\nTest commit\n', 3775879613L), (138, 2, '100644 a\x00og\x0c\x0f\xb5?\x94cv\x0br\x95\xfb\xb8\x14\xe9e\xfb \xc8', 912998690L), (178, 3, 'test 1\n', 1373561701L)], [(len, type, "".join(chunks), offset) for (len, type, chunks, offset) in p.iterobjects()])
+  
+    def test_iterentries(self):
+        p = self.get_pack_data(pack1_sha)
+        self.assertEquals(set([('og\x0c\x0f\xb5?\x94cv\x0br\x95\xfb\xb8\x14\xe9e\xfb \xc8', 178, 1373561701L), ('\xb2\xa2vj(y\xc2\t\xab\x11v\xe7\xe7x\xb8\x1a\xe4"\xee\xaa', 138, 912998690L), ('\xf1\x8f\xaa\x16S\x1a\xc5p\xa3\xfd\xc8\xc7\xca\x16h%H\xda\xfd\x12', 12, 3775879613L)]), set(p.iterentries()))
+  
+    def test_create_index_v1(self):
+        p = self.get_pack_data(pack1_sha)
+        p.create_index_v1("v1test.idx")
+        idx1 = load_pack_index("v1test.idx")
+        idx2 = self.get_pack_index(pack1_sha)
+        self.assertEquals(idx1, idx2)
+  
+    def test_create_index_v2(self):
+        p = self.get_pack_data(pack1_sha)
+        p.create_index_v2("v2test.idx")
+        idx1 = load_pack_index("v2test.idx")
+        idx2 = self.get_pack_index(pack1_sha)
+        self.assertEquals(idx1, idx2)
+
+
+class TestPack(PackTests):
+
+    def test_len(self):
+        p = self.get_pack(pack1_sha)
+        self.assertEquals(3, len(p))
+
+    def test_contains(self):
+        p = self.get_pack(pack1_sha)
+        self.assertTrue(tree_sha in p)
+
+    def test_get(self):
+        p = self.get_pack(pack1_sha)
+        self.assertEquals(type(p[tree_sha]), Tree)
+
+    def test_iter(self):
+        p = self.get_pack(pack1_sha)
+        self.assertEquals(set([tree_sha, commit_sha, a_sha]), set(p))
+
+    def test_get_object_at(self):
+        """Tests random access for non-delta objects"""
+        p = self.get_pack(pack1_sha)
+        obj = p[a_sha]
+        self.assertEqual(obj.type_name, 'blob')
+        self.assertEqual(obj.sha().hexdigest(), a_sha)
+        obj = p[tree_sha]
+        self.assertEqual(obj.type_name, 'tree')
+        self.assertEqual(obj.sha().hexdigest(), tree_sha)
+        obj = p[commit_sha]
+        self.assertEqual(obj.type_name, 'commit')
+        self.assertEqual(obj.sha().hexdigest(), commit_sha)
+
+    def test_copy(self):
+        origpack = self.get_pack(pack1_sha)
+        self.assertEquals(True, origpack.index.check())
+        write_pack("Elch", [(x, "") for x in origpack.iterobjects()], 
+            len(origpack))
+        newpack = Pack("Elch")
+        self.assertEquals(origpack, newpack)
+        self.assertEquals(True, newpack.index.check())
+        self.assertEquals(origpack.name(), newpack.name())
+        self.assertEquals(origpack.index.get_pack_checksum(), 
+                          newpack.index.get_pack_checksum())
+        
+        self.assertTrue(
+                (origpack.index.version != newpack.index.version) or
+                (origpack.index.get_stored_checksum() == newpack.index.get_stored_checksum()))
+
+    def test_commit_obj(self):
+        p = self.get_pack(pack1_sha)
+        commit = p[commit_sha]
+        self.assertEquals("James Westby <jw+debian@jameswestby.net>",
+            commit.author)
+        self.assertEquals([], commit.parents)
+
+    def test_name(self):
+        p = self.get_pack(pack1_sha)
+        self.assertEquals(pack1_sha, p.name())
 
 
 class TestHexToSha(unittest.TestCase):
 
     def test_simple(self):
-        self.assertEquals('\xab\xcd\x0e', hex_to_sha("abcde"))
+        self.assertEquals('\xab\xcd' * 10, hex_to_sha("abcd" * 10))
 
+    def test_reverse(self):
+        self.assertEquals("abcd" * 10, sha_to_hex('\xab\xcd' * 10))
 
-class TestMultiOrd(unittest.TestCase):
-
-    def test_simple(self):
-        self.assertEquals(418262508645L, multi_ord("abcde", 0, 5))
 
-
-class TestPackIndexWriting(object):
+class BaseTestPackIndexWriting(object):
 
     def test_empty(self):
         pack_checksum = 'r\x19\x80\xe8f\xaf\x9a_\x93\xadgAD\xe1E\x9b\x8b\xa3\xe7\xb7'
         self._write_fn("empty.idx", [], pack_checksum)
-        idx = PackIndex("empty.idx")
+        idx = load_pack_index("empty.idx")
         self.assertTrue(idx.check())
-        self.assertEquals(idx.get_stored_checksums()[0], pack_checksum)
+        self.assertEquals(idx.get_pack_checksum(), pack_checksum)
         self.assertEquals(0, len(idx))
 
     def test_single(self):
         pack_checksum = 'r\x19\x80\xe8f\xaf\x9a_\x93\xadgAD\xe1E\x9b\x8b\xa3\xe7\xb7'
         my_entries = [('og\x0c\x0f\xb5?\x94cv\x0br\x95\xfb\xb8\x14\xe9e\xfb \xc8', 178, 42)]
+        my_entries.sort()
         self._write_fn("single.idx", my_entries, pack_checksum)
-        idx = PackIndex("single.idx")
+        idx = load_pack_index("single.idx")
+        self.assertEquals(idx.version, self._expected_version)
         self.assertTrue(idx.check())
-        self.assertEquals(idx.get_stored_checksums()[0], pack_checksum)
+        self.assertEquals(idx.get_pack_checksum(), pack_checksum)
         self.assertEquals(1, len(idx))
         actual_entries = list(idx.iterentries())
         self.assertEquals(len(my_entries), len(actual_entries))
@@ -145,17 +260,28 @@ class TestPackIndexWriting(object):
                 self.assertTrue(b[2] is None)
 
 
-class TestPackIndexWritingv1(unittest.TestCase, TestPackIndexWriting):
+class TestPackIndexWritingv1(unittest.TestCase, BaseTestPackIndexWriting):
 
     def setUp(self):
         unittest.TestCase.setUp(self)
         self._has_crc32_checksum = False
+        self._expected_version = 1
         self._write_fn = write_pack_index_v1
 
 
-class TestPackIndexWritingv2(unittest.TestCase, TestPackIndexWriting):
+class TestPackIndexWritingv2(unittest.TestCase, BaseTestPackIndexWriting):
 
     def setUp(self):
         unittest.TestCase.setUp(self)
         self._has_crc32_checksum = True
+        self._expected_version = 2
         self._write_fn = write_pack_index_v2
+
+TEST_COMP1 = """\x78\x9c\x9d\x8e\xc1\x0a\xc2\x30\x10\x44\xef\xf9\x8a\xbd\xa9\x08\x92\x86\xb4\x26\x20\xe2\xd9\x83\x78\xf2\xbe\x49\x37\xb5\xa5\x69\xca\x36\xf5\xfb\x4d\xfd\x04\x67\x6e\x33\xcc\xf0\x32\x13\x81\xc6\x16\x8d\xa9\xbd\xad\x6c\xe3\x8a\x03\x4a\x73\xd6\xda\xd5\xa6\x51\x2e\x58\x65\x6c\x13\xbc\x94\x4a\xcc\xc8\x34\x65\x78\xa4\x89\x04\xae\xf9\x9d\x18\xee\x34\x46\x62\x78\x11\x4f\x29\xf5\x03\x5c\x86\x5f\x70\x5b\x30\x3a\x3c\x25\xee\xae\x50\xa9\xf2\x60\xa4\xaa\x34\x1c\x65\x91\xf0\x29\xc6\x3e\x67\xfa\x6f\x2d\x9e\x9c\x3e\x7d\x4b\xc0\x34\x8f\xe8\x29\x6e\x48\xa1\xa0\xc4\x88\xf3\xfe\xb0\x5b\x20\x85\xb0\x50\x06\xe4\x6e\xdd\xca\xd3\x17\x26\xfa\x49\x23"""
+
+
+class ZlibTests(unittest.TestCase):
+
+    def test_simple_decompress(self):
+        self.assertEquals((["tree 4ada885c9196b6b6fa08744b5862bf92896fc002\nparent None\nauthor Jelmer Vernooij <jelmer@samba.org> 1228980214 +0000\ncommitter Jelmer Vernooij <jelmer@samba.org> 1228980214 +0000\n\nProvide replacement for mmap()'s offset argument."], 158, 'Z'), 
+        read_zlib_chunks(StringIO(TEST_COMP1).read, 229))