Change parse_tree to return a list rather than a dict.
[jelmer/dulwich-libgit2.git] / dulwich / tests / test_objects.py
index bed2606c1549789ba333b7a35f95f3370bf0de51..17a40df8f79af39cd02404ff8166203159753877 100644 (file)
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 # MA  02110-1301, USA.
 
+
+"""Tests for git base objects."""
+
+# TODO: Round-trip parse-serialize-parse and serialize-parse-serialize tests.
+
+
 import os
+import stat
 import unittest
 
-from dulwich.objects import (Blob,
-                         Tree,
-                         Commit,
-                         Tag
-                         )
+import nose
+
+from dulwich.objects import (
+    Blob,
+    Tree,
+    Commit,
+    Tag,
+    format_timezone,
+    hex_to_sha,
+    parse_timezone,
+    parse_tree,
+    _parse_tree_py,
+    )
 
 a_sha = '6f670c0fb53f9463760b7295fbb814e965fb20c8'
 b_sha = '2969be3e8ee1c0222396a5611407e4769f14e54b'
@@ -33,101 +48,329 @@ tree_sha = '70c190eb48fa8bbb50ddc692a17b44cb781af7f6'
 tag_sha = '71033db03a03c6a36721efcf1968dd8f8e0cf023'
 
 class BlobReadTests(unittest.TestCase):
-  """Test decompression of blobs"""
-
-  def get_sha_file(self, obj, base, sha):
-    return obj.from_file(os.path.join(os.path.dirname(__file__),
-                                      'data', base, sha))
-
-  def get_blob(self, sha):
-    """Return the blob named sha from the test data dir"""
-    return self.get_sha_file(Blob, 'blobs', sha)
-
-  def get_tree(self, sha):
-    return self.get_sha_file(Tree, 'trees', sha)
-
-  def get_tag(self, sha):
-    return self.get_sha_file(Tag, 'tags', sha)
-
-  def commit(self, sha):
-    return self.get_sha_file(Commit, 'commits', sha)
-
-  def test_decompress_simple_blob(self):
-    b = self.get_blob(a_sha)
-    self.assertEqual(b.data, 'test 1\n')
-    self.assertEqual(b.sha().hexdigest(), a_sha)
-
-  def test_parse_empty_blob_object(self):
-    sha = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
-    b = self.get_blob(sha)
-    self.assertEqual(b.data, '')
-    self.assertEqual(b.sha().hexdigest(), sha)
-
-  def test_create_blob_from_string(self):
-    string = 'test 2\n'
-    b = Blob.from_string(string)
-    self.assertEqual(b.data, string)
-    self.assertEqual(b.sha().hexdigest(), b_sha)
-
-  def test_parse_legacy_blob(self):
-    string = 'test 3\n'
-    b = self.get_blob(c_sha)
-    self.assertEqual(b.data, string)
-    self.assertEqual(b.sha().hexdigest(), c_sha)
-
-  def test_eq(self):
-    blob1 = self.get_blob(a_sha)
-    blob2 = self.get_blob(a_sha)
-    self.assertEqual(blob1, blob2)
-
-  def test_read_tree_from_file(self):
-    t = self.get_tree(tree_sha)
-    self.assertEqual(t.entries()[0], (33188, 'a', a_sha))
-    self.assertEqual(t.entries()[1], (33188, 'b', b_sha))
-
-  def test_read_tag_from_file(self):
-    t = self.get_tag(tag_sha)
-    self.assertEqual(t.object, (Commit, '51b668fd5bf7061b7d6fa525f88803e6cfadaa51'))
-    self.assertEqual(t.name,'signed')
-    self.assertEqual(t.tagger,'Ali Sabil <ali.sabil@gmail.com>')
-    self.assertEqual(t.tag_time, 1231203091)
-    self.assertEqual(t.message, 'This is a signed tag\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.9 (GNU/Linux)\n\niEYEABECAAYFAkliqx8ACgkQqSMmLy9u/kcx5ACfakZ9NnPl02tOyYP6pkBoEkU1\n5EcAn0UFgokaSvS371Ym/4W9iJj6vh3h\n=ql7y\n-----END PGP SIGNATURE-----\n')
-
-
-  def test_read_commit_from_file(self):
-    sha = '60dacdc733de308bb77bb76ce0fb0f9b44c9769e'
-    c = self.commit(sha)
-    self.assertEqual(c.tree, tree_sha)
-    self.assertEqual(c.parents, ['0d89f20333fbb1d2f3a94da77f4981373d8f4310'])
-    self.assertEqual(c.author,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time, 1174759230)
-    self.assertEqual(c.message, 'Test commit\n')
-
-  def test_read_commit_no_parents(self):
-    sha = '0d89f20333fbb1d2f3a94da77f4981373d8f4310'
-    c = self.commit(sha)
-    self.assertEqual(c.tree, '90182552c4a85a45ec2a835cadc3451bebdfe870')
-    self.assertEqual(c.parents, [])
-    self.assertEqual(c.author,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time, 1174758034)
-    self.assertEqual(c.message, 'Test commit\n')
-
-  def test_read_commit_two_parents(self):
-    sha = '5dac377bdded4c9aeb8dff595f0faeebcc8498cc'
-    c = self.commit(sha)
-    self.assertEqual(c.tree, 'd80c186a03f423a81b39df39dc87fd269736ca86')
-    self.assertEqual(c.parents, ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
-                                   '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'])
-    self.assertEqual(c.author,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.committer,
-        'James Westby <jw+debian@jameswestby.net>')
-    self.assertEqual(c.commit_time, 1174773719)
-    self.assertEqual(c.message, 'Merge ../b\n')
+    """Test decompression of blobs"""
+  
+    def get_sha_file(self, obj, base, sha):
+        return obj.from_file(os.path.join(os.path.dirname(__file__),
+                                          'data', base, sha))
+  
+    def get_blob(self, sha):
+        """Return the blob named sha from the test data dir"""
+        return self.get_sha_file(Blob, 'blobs', sha)
+  
+    def get_tree(self, sha):
+        return self.get_sha_file(Tree, 'trees', sha)
+  
+    def get_tag(self, sha):
+        return self.get_sha_file(Tag, 'tags', sha)
+  
+    def commit(self, sha):
+        return self.get_sha_file(Commit, 'commits', sha)
+  
+    def test_decompress_simple_blob(self):
+        b = self.get_blob(a_sha)
+        self.assertEqual(b.data, 'test 1\n')
+        self.assertEqual(b.sha().hexdigest(), a_sha)
+  
+    def test_hash(self):
+        b = self.get_blob(a_sha)
+        self.assertEqual(hash(b.id), hash(b))
+
+    def test_parse_empty_blob_object(self):
+        sha = 'e69de29bb2d1d6434b8b29ae775ad8c2e48c5391'
+        b = self.get_blob(sha)
+        self.assertEqual(b.data, '')
+        self.assertEqual(b.id, sha)
+        self.assertEqual(b.sha().hexdigest(), sha)
+  
+    def test_create_blob_from_string(self):
+        string = 'test 2\n'
+        b = Blob.from_string(string)
+        self.assertEqual(b.data, string)
+        self.assertEqual(b.sha().hexdigest(), b_sha)
+
+    def test_chunks(self):
+        string = 'test 5\n'
+        b = Blob.from_string(string)
+        self.assertEqual([string], b.chunked)
+
+    def test_set_chunks(self):
+        b = Blob()
+        b.chunked = ['te', 'st', ' 5\n']
+        self.assertEqual('test 5\n', b.data)
+        b.chunked = ['te', 'st', ' 6\n']
+        self.assertEqual('test 6\n', b.as_raw_string())
+  
+    def test_parse_legacy_blob(self):
+        string = 'test 3\n'
+        b = self.get_blob(c_sha)
+        self.assertEqual(b.data, string)
+        self.assertEqual(b.sha().hexdigest(), c_sha)
+  
+    def test_eq(self):
+        blob1 = self.get_blob(a_sha)
+        blob2 = self.get_blob(a_sha)
+        self.assertEqual(blob1, blob2)
+  
+    def test_read_tree_from_file(self):
+        t = self.get_tree(tree_sha)
+        self.assertEqual(t.entries()[0], (33188, 'a', a_sha))
+        self.assertEqual(t.entries()[1], (33188, 'b', b_sha))
+  
+    def test_read_tag_from_file(self):
+        t = self.get_tag(tag_sha)
+        self.assertEqual(t.object, (Commit, '51b668fd5bf7061b7d6fa525f88803e6cfadaa51'))
+        self.assertEqual(t.name,'signed')
+        self.assertEqual(t.tagger,'Ali Sabil <ali.sabil@gmail.com>')
+        self.assertEqual(t.tag_time, 1231203091)
+        self.assertEqual(t.message, 'This is a signed tag\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v1.4.9 (GNU/Linux)\n\niEYEABECAAYFAkliqx8ACgkQqSMmLy9u/kcx5ACfakZ9NnPl02tOyYP6pkBoEkU1\n5EcAn0UFgokaSvS371Ym/4W9iJj6vh3h\n=ql7y\n-----END PGP SIGNATURE-----\n')
+  
+  
+    def test_read_commit_from_file(self):
+        sha = '60dacdc733de308bb77bb76ce0fb0f9b44c9769e'
+        c = self.commit(sha)
+        self.assertEqual(c.tree, tree_sha)
+        self.assertEqual(c.parents, ['0d89f20333fbb1d2f3a94da77f4981373d8f4310'])
+        self.assertEqual(c.author,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.committer,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.commit_time, 1174759230)
+        self.assertEqual(c.commit_timezone, 0)
+        self.assertEqual(c.author_timezone, 0)
+        self.assertEqual(c.message, 'Test commit\n')
+  
+    def test_read_commit_no_parents(self):
+        sha = '0d89f20333fbb1d2f3a94da77f4981373d8f4310'
+        c = self.commit(sha)
+        self.assertEqual(c.tree, '90182552c4a85a45ec2a835cadc3451bebdfe870')
+        self.assertEqual(c.parents, [])
+        self.assertEqual(c.author,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.committer,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.commit_time, 1174758034)
+        self.assertEqual(c.commit_timezone, 0)
+        self.assertEqual(c.author_timezone, 0)
+        self.assertEqual(c.message, 'Test commit\n')
+  
+    def test_read_commit_two_parents(self):
+        sha = '5dac377bdded4c9aeb8dff595f0faeebcc8498cc'
+        c = self.commit(sha)
+        self.assertEqual(c.tree, 'd80c186a03f423a81b39df39dc87fd269736ca86')
+        self.assertEqual(c.parents, ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
+                                       '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'])
+        self.assertEqual(c.author,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.committer,
+            'James Westby <jw+debian@jameswestby.net>')
+        self.assertEqual(c.commit_time, 1174773719)
+        self.assertEqual(c.commit_timezone, 0)
+        self.assertEqual(c.author_timezone, 0)
+        self.assertEqual(c.message, 'Merge ../b\n')
+  
+
+
+class CommitSerializationTests(unittest.TestCase):
+
+    def make_base(self):
+        c = Commit()
+        c.tree = 'd80c186a03f423a81b39df39dc87fd269736ca86'
+        c.parents = ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd', '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6']
+        c.author = 'James Westby <jw+debian@jameswestby.net>'
+        c.committer = 'James Westby <jw+debian@jameswestby.net>'
+        c.commit_time = 1174773719
+        c.author_time = 1174773719
+        c.commit_timezone = 0
+        c.author_timezone = 0
+        c.message =  'Merge ../b\n'
+        return c
+
+    def test_encoding(self):
+        c = self.make_base()
+        c.encoding = "iso8859-1"
+        self.assertTrue("encoding iso8859-1\n" in c.as_raw_string())        
+
+    def test_short_timestamp(self):
+        c = self.make_base()
+        c.commit_time = 30
+        c1 = Commit()
+        c1.set_raw_string(c.as_raw_string())
+        self.assertEquals(30, c1.commit_time)
+
+    def test_raw_length(self):
+        c = self.make_base()
+        self.assertEquals(len(c.as_raw_string()), c.raw_length())
+
+    def test_simple(self):
+        c = self.make_base()
+        self.assertEquals(c.id, '5dac377bdded4c9aeb8dff595f0faeebcc8498cc')
+        self.assertEquals(
+                'tree d80c186a03f423a81b39df39dc87fd269736ca86\n'
+                'parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd\n'
+                'parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6\n'
+                'author James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                '\n'
+                'Merge ../b\n', c.as_raw_string())
+
+    def test_timezone(self):
+        c = self.make_base()
+        c.commit_timezone = 5 * 60
+        self.assertTrue(" +0005\n" in c.as_raw_string())
+
+    def test_neg_timezone(self):
+        c = self.make_base()
+        c.commit_timezone = -1 * 3600
+        self.assertTrue(" -0100\n" in c.as_raw_string())
+
+
+class CommitDeserializationTests(unittest.TestCase):
+
+    def test_simple(self):
+        c = Commit.from_string(
+                'tree d80c186a03f423a81b39df39dc87fd269736ca86\n'
+                'parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd\n'
+                'parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6\n'
+                'author James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                '\n'
+                'Merge ../b\n')
+        self.assertEquals('Merge ../b\n', c.message)
+        self.assertEquals('James Westby <jw+debian@jameswestby.net>',
+            c.author)
+        self.assertEquals('James Westby <jw+debian@jameswestby.net>',
+            c.committer)
+        self.assertEquals('d80c186a03f423a81b39df39dc87fd269736ca86',
+            c.tree)
+        self.assertEquals(['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
+                          '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'],
+            c.parents)
+
+    def test_custom(self):
+        c = Commit.from_string(
+                'tree d80c186a03f423a81b39df39dc87fd269736ca86\n'
+                'parent ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd\n'
+                'parent 4cffe90e0a41ad3f5190079d7c8f036bde29cbe6\n'
+                'author James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'committer James Westby <jw+debian@jameswestby.net> 1174773719 +0000\n'
+                'extra-field data\n'
+                '\n'
+                'Merge ../b\n')
+        self.assertEquals([('extra-field', 'data')], c.extra)
+
+
+class TreeTests(unittest.TestCase):
+
+    def test_simple(self):
+        myhexsha = "d80c186a03f423a81b39df39dc87fd269736ca86"
+        x = Tree()
+        x["myname"] = (0100755, myhexsha)
+        self.assertEquals('100755 myname\0' + hex_to_sha(myhexsha),
+                x.as_raw_string())
+
+    def test_tree_dir_sort(self):
+        x = Tree()
+        x["a.c"] = (0100755, "d80c186a03f423a81b39df39dc87fd269736ca86")
+        x["a"] = (stat.S_IFDIR, "d80c186a03f423a81b39df39dc87fd269736ca86")
+        x["a/c"] = (stat.S_IFDIR, "d80c186a03f423a81b39df39dc87fd269736ca86")
+        self.assertEquals(["a.c", "a", "a/c"], [p[0] for p in x.iteritems()])
+
+    def _do_test_parse_tree(self, parse_tree):
+        o = Tree.from_file(os.path.join(os.path.dirname(__file__), 'data',
+                                        'trees', tree_sha))
+        self.assertEquals([('a', 0100644, a_sha), ('b', 0100644, b_sha)],
+                          list(parse_tree(o.as_raw_string())))
+
+    def test_parse_tree(self):
+        self._do_test_parse_tree(_parse_tree_py)
+
+    def test_parse_tree_extension(self):
+        if parse_tree is _parse_tree_py:
+            raise nose.SkipTest('parse_tree extension not found')
+        self._do_test_parse_tree(parse_tree)
+
+
+class TagSerializeTests(unittest.TestCase):
+
+    def test_serialize_simple(self):
+        x = Tag()
+        x.tagger = "Jelmer Vernooij <jelmer@samba.org>"
+        x.name = "0.1"
+        x.message = "Tag 0.1"
+        x.object = (Blob, "d80c186a03f423a81b39df39dc87fd269736ca86")
+        x.tag_time = 423423423
+        x.tag_timezone = 0
+        self.assertEquals("""object d80c186a03f423a81b39df39dc87fd269736ca86
+type blob
+tag 0.1
+tagger Jelmer Vernooij <jelmer@samba.org> 423423423 +0000
+
+Tag 0.1""", x.as_raw_string())
+
+
+class TagParseTests(unittest.TestCase):
+
+    def test_parse_ctime(self):
+        x = Tag()
+        x.set_raw_string("""object a38d6181ff27824c79fc7df825164a212eff6a3f
+type commit
+tag v2.6.22-rc7
+tagger Linus Torvalds <torvalds@woody.linux-foundation.org> Sun Jul 1 12:54:34 2007 -0700
+
+Linux 2.6.22-rc7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQBGiAaAF3YsRnbiHLsRAitMAKCiLboJkQECM/jpYsY3WPfvUgLXkACgg3ql
+OK2XeQOiEeXtT76rV4t2WR4=
+=ivrA
+-----END PGP SIGNATURE-----
+""")
+        self.assertEquals("Linus Torvalds <torvalds@woody.linux-foundation.org>", x.tagger)
+        self.assertEquals("v2.6.22-rc7", x.name)
+
+    def test_parse_no_tagger(self):
+        x = Tag()
+        x.set_raw_string("""object a38d6181ff27824c79fc7df825164a212eff6a3f
+type commit
+tag v2.6.22-rc7
+
+Linux 2.6.22-rc7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQBGiAaAF3YsRnbiHLsRAitMAKCiLboJkQECM/jpYsY3WPfvUgLXkACgg3ql
+OK2XeQOiEeXtT76rV4t2WR4=
+=ivrA
+-----END PGP SIGNATURE-----
+""")
+        self.assertEquals(None, x.tagger)
+        self.assertEquals("v2.6.22-rc7", x.name)
+
+
+class TimezoneTests(unittest.TestCase):
+
+    def test_parse_timezone_utc(self):
+        self.assertEquals(0, parse_timezone("+0000"))
+
+    def test_generate_timezone_utc(self):
+        self.assertEquals("+0000", format_timezone(0))
+
+    def test_parse_timezone_cet(self):
+        self.assertEquals(60 * 60, parse_timezone("+0100"))
+
+    def test_format_timezone_cet(self):
+        self.assertEquals("+0100", format_timezone(60 * 60))
+
+    def test_format_timezone_pdt(self):
+        self.assertEquals("-0400", format_timezone(-4 * 60 * 60))
+
+    def test_parse_timezone_pdt(self):
+        self.assertEquals(-4 * 60 * 60, parse_timezone("-0400"))
+
+    def test_format_timezone_pdt_half(self):
+        self.assertEquals("-0440", format_timezone(int(((-4 * 60) - 40) * 60)))
 
+    def test_parse_timezone_pdt_half(self):
+        self.assertEquals(((-4 * 60) - 40) * 60, parse_timezone("-0440"))