# test_objects.py -- tests for objects.py
# Copyright (C) 2007 James Westby <jw+debian@jameswestby.net>
-#
+#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; version 2
-# of the License or (at your option) any later version of
+# of the License or (at your option) any later version of
# the License.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# 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.
parse_timezone,
parse_tree,
_parse_tree_py,
+ sorted_tree_items,
+ _sorted_tree_items_py,
)
from dulwich.tests import (
TestSkipped,
)
+from utils import (
+ make_commit,
+ make_object,
+ )
a_sha = '6f670c0fb53f9463760b7295fbb814e965fb20c8'
b_sha = '2969be3e8ee1c0222396a5611407e4769f14e54b'
# Implementation of permutations from Python 2.6 documentation:
# http://docs.python.org/2.6/library/itertools.html#itertools.permutations
# Copyright (c) 2001-2010 Python Software Foundation; All Rights Reserved
+ # Modified syntax slightly to run under Python 2.4.
def permutations(iterable, r=None):
# permutations('ABCD', 2) --> AB AC AD BA BC BD CA CB CD DA DB DC
# permutations(range(3)) --> 012 021 102 120 201 210
pool = tuple(iterable)
n = len(pool)
- r = n if r is None else r
+ if r is None:
+ r = n
if r > n:
return
indices = range(n)
def get_sha_file(self, cls, base, sha):
dir = os.path.join(os.path.dirname(__file__), 'data', base)
- return cls.from_file(hex_to_filename(dir, sha))
+ return cls.from_path(hex_to_filename(dir, sha))
def get_blob(self, sha):
"""Return the blob named sha from the test data dir"""
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.parents,
+ ['0d89f20333fbb1d2f3a94da77f4981373d8f4310'])
self.assertEqual(c.author,
'James Westby <jw+debian@jameswestby.net>')
self.assertEqual(c.committer,
self.assertEqual(c.author_timezone, 0)
self.assertEqual(c.message, 'Merge ../b\n')
- def test_check_id(self):
- wrong_sha = '1' * 40
- b = self.get_blob(wrong_sha)
- self.assertEqual(wrong_sha, b.id)
- self.assertRaises(ChecksumMismatch, b.check)
- self.assertEqual('742b386350576589175e374a5706505cbd17680c', b.id)
-
class ShaFileCheckTests(unittest.TestCase):
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 make_commit(self, **kwargs):
+ attrs = {'tree': 'd80c186a03f423a81b39df39dc87fd269736ca86',
+ 'parents': ['ab64bbdcc51b170d21588e5c5d391ee5c0c96dfd',
+ '4cffe90e0a41ad3f5190079d7c8f036bde29cbe6'],
+ 'author': 'James Westby <jw+debian@jameswestby.net>',
+ 'committer': 'James Westby <jw+debian@jameswestby.net>',
+ 'commit_time': 1174773719,
+ 'author_time': 1174773719,
+ 'commit_timezone': 0,
+ 'author_timezone': 0,
+ 'message': 'Merge ../b\n'}
+ attrs.update(kwargs)
+ return make_commit(**attrs)
def test_encoding(self):
- c = self.make_base()
- c.encoding = "iso8859-1"
- self.assertTrue("encoding iso8859-1\n" in c.as_raw_string())
+ c = self.make_commit(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
+ c = self.make_commit(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()
+ c = self.make_commit()
self.assertEquals(len(c.as_raw_string()), c.raw_length())
def test_simple(self):
- c = self.make_base()
+ c = self.make_commit()
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'
+ '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
+ c = self.make_commit(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
+ c = self.make_commit(commit_timezone=(-1 * 3600))
self.assertTrue(" -0100\n" in c.as_raw_string())
self.assertCheckFails(Commit, text)
+_TREE_ITEMS = {
+ 'a.c': (0100755, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ 'a': (stat.S_IFDIR, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ 'a/c': (stat.S_IFDIR, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ }
+
+_SORTED_TREE_ITEMS = [
+ ('a.c', 0100755, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ ('a', stat.S_IFDIR, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ ('a/c', stat.S_IFDIR, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ ]
+
+
class TreeTests(ShaFileCheckTests):
def test_simple(self):
self.assertEquals('100755 myname\0' + hex_to_sha(myhexsha),
x.as_raw_string())
- def test_tree_dir_sort(self):
+ def test_tree_update_id(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()])
+ self.assertEquals("0c5c6bc2c081accfbc250331b19e43b904ab9cdd", x.id)
+ x["a.b"] = (stat.S_IFDIR, "d80c186a03f423a81b39df39dc87fd269736ca86")
+ self.assertEquals("07bfcb5f3ada15bbebdfa3bbb8fd858a363925c8", x.id)
+
+ def test_tree_dir_sort(self):
+ x = Tree()
+ for name, item in _TREE_ITEMS.iteritems():
+ x[name] = item
+ self.assertEquals(_SORTED_TREE_ITEMS, list(x.iteritems()))
def _do_test_parse_tree(self, parse_tree):
dir = os.path.join(os.path.dirname(__file__), 'data', 'trees')
- o = Tree.from_file(hex_to_filename(dir, tree_sha))
- o._parse_file()
+ o = Tree.from_path(hex_to_filename(dir, tree_sha))
self.assertEquals([('a', 0100644, a_sha), ('b', 0100644, b_sha)],
list(parse_tree(o.as_raw_string())))
raise TestSkipped('parse_tree extension not found')
self._do_test_parse_tree(parse_tree)
+ def _do_test_sorted_tree_items(self, sorted_tree_items):
+ def do_sort(entries):
+ return list(sorted_tree_items(entries))
+
+ self.assertEqual(_SORTED_TREE_ITEMS, do_sort(_TREE_ITEMS))
+
+ # C/Python implementations may differ in specific error types, but
+ # should all error on invalid inputs.
+ # For example, the C implementation has stricter type checks, so may
+ # raise TypeError where the Python implementation raises AttributeError.
+ errors = (TypeError, ValueError, AttributeError)
+ self.assertRaises(errors, do_sort, 'foo')
+ self.assertRaises(errors, do_sort, {'foo': (1, 2, 3)})
+
+ myhexsha = 'd80c186a03f423a81b39df39dc87fd269736ca86'
+ self.assertRaises(errors, do_sort, {'foo': ('xxx', myhexsha)})
+ self.assertRaises(errors, do_sort, {'foo': (0100755, 12345)})
+
+ def test_sorted_tree_items(self):
+ self._do_test_sorted_tree_items(_sorted_tree_items_py)
+
+ def test_sorted_tree_items_extension(self):
+ if sorted_tree_items is _sorted_tree_items_py:
+ raise TestSkipped('sorted_tree_items extension not found')
+ self._do_test_sorted_tree_items(sorted_tree_items)
+
def test_check(self):
t = Tree
sha = hex_to_sha(a_sha)
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())
+ x = make_object(Tag,
+ tagger='Jelmer Vernooij <jelmer@samba.org>',
+ name='0.1',
+ message='Tag 0.1',
+ object=(Blob, 'd80c186a03f423a81b39df39dc87fd269736ca86'),
+ tag_time=423423423,
+ tag_timezone=0)
+ self.assertEquals(('object d80c186a03f423a81b39df39dc87fd269736ca86\n'
+ 'type blob\n'
+ 'tag 0.1\n'
+ 'tagger Jelmer Vernooij <jelmer@samba.org> '
+ '423423423 +0000\n'
+ '\n'
+ 'Tag 0.1'), x.as_raw_string())
default_tagger = ('Linus Torvalds <torvalds@woody.linux-foundation.org> '
git.samba.org / jelmer / dulwich-libgit2.git / blobdiff