diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-03-04 09:06:03 +0100 | 
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-03-04 09:06:03 +0100 | 
| commit | 72bcdbd0a0c8cc6aa2a7433169aa49c7fc19b55b (patch) | |
| tree | 09e28dfbad901791a8306e890f69a6b737d20a03 /test/git/test_commit.py | |
| parent | 4956c1e618bfcfeef86c6ea90c22dd04ca81b9db (diff) | |
| download | gitpython-72bcdbd0a0c8cc6aa2a7433169aa49c7fc19b55b.tar.gz | |
Converted all tabs to 4 space characters each to comply with pep8
Diffstat (limited to 'test/git/test_commit.py')
| -rw-r--r-- | test/git/test_commit.py | 304 | 
1 files changed, 152 insertions, 152 deletions
| diff --git a/test/git/test_commit.py b/test/git/test_commit.py index da18f275..0a8470ec 100644 --- a/test/git/test_commit.py +++ b/test/git/test_commit.py @@ -9,166 +9,166 @@ from git import *  class TestCommit(TestBase): -	def test_bake(self): +    def test_bake(self): -		commit = Commit(self.rorepo, **{'sha': '2454ae89983a4496a445ce347d7a41c0bb0ea7ae'}) -		commit.author # bake +        commit = Commit(self.rorepo, **{'sha': '2454ae89983a4496a445ce347d7a41c0bb0ea7ae'}) +        commit.author # bake -		assert_equal("Sebastian Thiel", commit.author.name) -		assert_equal("byronimo@gmail.com", commit.author.email) -		assert commit.author == commit.committer -		assert isinstance(commit.authored_date, int) and isinstance(commit.committed_date, int) -		assert commit.message == "Added missing information to docstrings of commit and stats module" +        assert_equal("Sebastian Thiel", commit.author.name) +        assert_equal("byronimo@gmail.com", commit.author.email) +        assert commit.author == commit.committer +        assert isinstance(commit.authored_date, int) and isinstance(commit.committed_date, int) +        assert commit.message == "Added missing information to docstrings of commit and stats module" -	def test_stats(self): -		commit = Commit(self.rorepo, '33ebe7acec14b25c5f84f35a664803fcab2f7781') -		stats = commit.stats -		 -		def check_entries(d): -			assert isinstance(d, dict) -			for key in ("insertions", "deletions", "lines"): -				assert key in d -		# END assertion helper  -		assert stats.files  -		assert stats.total -		 -		check_entries(stats.total)  -		assert "files" in stats.total -		 -		for filepath, d in stats.files.items(): -			check_entries(d) -		# END for each stated file -		 -		# assure data is parsed properly -		michael = Actor._from_string("Michael Trier <mtrier@gmail.com>") -		assert commit.author == michael -		assert commit.committer == michael -		assert commit.authored_date == 1210193388 -		assert commit.committed_date == 1210193388 -		assert commit.message == "initial project" -		 -	def test_traversal(self): -		start = self.rorepo.commit("a4d06724202afccd2b5c54f81bcf2bf26dea7fff") -		first = self.rorepo.commit("33ebe7acec14b25c5f84f35a664803fcab2f7781") -		p0 = start.parents[0] -		p1 = start.parents[1] -		p00 = p0.parents[0] -		p10 = p1.parents[0] -		 -		# basic branch first, depth first -		dfirst = start.traverse(branch_first=False) -		bfirst = start.traverse(branch_first=True) -		assert dfirst.next() == p0 -		assert dfirst.next() == p00 -		 -		assert bfirst.next() == p0 -		assert bfirst.next() == p1 -		assert bfirst.next() == p00 -		assert bfirst.next() == p10 -		 -		# at some point, both iterations should stop -		assert list(bfirst)[-1] == first -		stoptraverse = self.rorepo.commit("254d04aa3180eb8b8daf7b7ff25f010cd69b4e7d").traverse(as_edge=True) -		l = list(stoptraverse) -		assert len(l[0]) == 2 -		 -		# ignore self -		assert start.traverse(ignore_self=False).next() == start -		 -		# depth  -		assert len(list(start.traverse(ignore_self=False, depth=0))) == 1 -		 -		# prune -		assert start.traverse(branch_first=1, prune=lambda i,d: i==p0).next() == p1 -		 -		# predicate -		assert start.traverse(branch_first=1, predicate=lambda i,d: i==p1).next() == p1 -		 -		# traversal should stop when the beginning is reached -		self.failUnlessRaises(StopIteration, first.traverse().next) -		 -		# parents of the first commit should be empty ( as the only parent has a null  -		# sha ) -		assert len(first.parents) == 0 -		 -	def test_iteration(self): -		# we can iterate commits -		all_commits = Commit.list_items(self.rorepo, 'master') -		assert all_commits -		assert all_commits == list(self.rorepo.iter_commits()) -		 -		# this includes merge commits -		mcomit = Commit(self.rorepo, 'd884adc80c80300b4cc05321494713904ef1df2d') -		assert mcomit in all_commits -		 -		# we can limit the result to paths -		ltd_commits = list(self.rorepo.iter_commits(paths='CHANGES')) -		assert ltd_commits and len(ltd_commits) < len(all_commits) -		 -		# show commits of multiple paths, resulting in a union of commits -		less_ltd_commits = list(Commit.iter_items(self.rorepo, 'master', paths=('CHANGES', 'AUTHORS'))) -		assert len(ltd_commits) < len(less_ltd_commits) -		 -		 -	@patch_object(Git, '_call_process') -	def test_rev_list_bisect_all(self, git): -		""" -		'git rev-list --bisect-all' returns additional information -		in the commit header.  This test ensures that we properly parse it. -		""" +    def test_stats(self): +        commit = Commit(self.rorepo, '33ebe7acec14b25c5f84f35a664803fcab2f7781') +        stats = commit.stats +         +        def check_entries(d): +            assert isinstance(d, dict) +            for key in ("insertions", "deletions", "lines"): +                assert key in d +        # END assertion helper  +        assert stats.files  +        assert stats.total +         +        check_entries(stats.total)  +        assert "files" in stats.total +         +        for filepath, d in stats.files.items(): +            check_entries(d) +        # END for each stated file +         +        # assure data is parsed properly +        michael = Actor._from_string("Michael Trier <mtrier@gmail.com>") +        assert commit.author == michael +        assert commit.committer == michael +        assert commit.authored_date == 1210193388 +        assert commit.committed_date == 1210193388 +        assert commit.message == "initial project" +         +    def test_traversal(self): +        start = self.rorepo.commit("a4d06724202afccd2b5c54f81bcf2bf26dea7fff") +        first = self.rorepo.commit("33ebe7acec14b25c5f84f35a664803fcab2f7781") +        p0 = start.parents[0] +        p1 = start.parents[1] +        p00 = p0.parents[0] +        p10 = p1.parents[0] +         +        # basic branch first, depth first +        dfirst = start.traverse(branch_first=False) +        bfirst = start.traverse(branch_first=True) +        assert dfirst.next() == p0 +        assert dfirst.next() == p00 +         +        assert bfirst.next() == p0 +        assert bfirst.next() == p1 +        assert bfirst.next() == p00 +        assert bfirst.next() == p10 +         +        # at some point, both iterations should stop +        assert list(bfirst)[-1] == first +        stoptraverse = self.rorepo.commit("254d04aa3180eb8b8daf7b7ff25f010cd69b4e7d").traverse(as_edge=True) +        l = list(stoptraverse) +        assert len(l[0]) == 2 +         +        # ignore self +        assert start.traverse(ignore_self=False).next() == start +         +        # depth  +        assert len(list(start.traverse(ignore_self=False, depth=0))) == 1 +         +        # prune +        assert start.traverse(branch_first=1, prune=lambda i,d: i==p0).next() == p1 +         +        # predicate +        assert start.traverse(branch_first=1, predicate=lambda i,d: i==p1).next() == p1 +         +        # traversal should stop when the beginning is reached +        self.failUnlessRaises(StopIteration, first.traverse().next) +         +        # parents of the first commit should be empty ( as the only parent has a null  +        # sha ) +        assert len(first.parents) == 0 +         +    def test_iteration(self): +        # we can iterate commits +        all_commits = Commit.list_items(self.rorepo, 'master') +        assert all_commits +        assert all_commits == list(self.rorepo.iter_commits()) +         +        # this includes merge commits +        mcomit = Commit(self.rorepo, 'd884adc80c80300b4cc05321494713904ef1df2d') +        assert mcomit in all_commits +         +        # we can limit the result to paths +        ltd_commits = list(self.rorepo.iter_commits(paths='CHANGES')) +        assert ltd_commits and len(ltd_commits) < len(all_commits) +         +        # show commits of multiple paths, resulting in a union of commits +        less_ltd_commits = list(Commit.iter_items(self.rorepo, 'master', paths=('CHANGES', 'AUTHORS'))) +        assert len(ltd_commits) < len(less_ltd_commits) +         +         +    @patch_object(Git, '_call_process') +    def test_rev_list_bisect_all(self, git): +        """ +        'git rev-list --bisect-all' returns additional information +        in the commit header.  This test ensures that we properly parse it. +        """ -		git.return_value = fixture('rev_list_bisect_all') +        git.return_value = fixture('rev_list_bisect_all') -		revs = self.rorepo.git.rev_list('HEAD', -									  pretty='raw', -									  first_parent=True, -									  bisect_all=True) -		assert_true(git.called) +        revs = self.rorepo.git.rev_list('HEAD', +                                      pretty='raw', +                                      first_parent=True, +                                      bisect_all=True) +        assert_true(git.called) -		commits = Commit._iter_from_process_or_stream(self.rorepo, ListProcessAdapter(revs), True) -		expected_ids = ( -			'cf37099ea8d1d8c7fbf9b6d12d7ec0249d3acb8b', -			'33ebe7acec14b25c5f84f35a664803fcab2f7781', -			'a6604a00a652e754cb8b6b0b9f194f839fc38d7c', -			'8df638c22c75ddc9a43ecdde90c0c9939f5009e7', -			'c231551328faa864848bde6ff8127f59c9566e90', -		) -		for sha1, commit in zip(expected_ids, commits): -			assert_equal(sha1, commit.sha) +        commits = Commit._iter_from_process_or_stream(self.rorepo, ListProcessAdapter(revs), True) +        expected_ids = ( +            'cf37099ea8d1d8c7fbf9b6d12d7ec0249d3acb8b', +            '33ebe7acec14b25c5f84f35a664803fcab2f7781', +            'a6604a00a652e754cb8b6b0b9f194f839fc38d7c', +            '8df638c22c75ddc9a43ecdde90c0c9939f5009e7', +            'c231551328faa864848bde6ff8127f59c9566e90', +        ) +        for sha1, commit in zip(expected_ids, commits): +            assert_equal(sha1, commit.sha) -	def test_count(self): -		assert self.rorepo.tag('refs/tags/0.1.5').commit.count( ) == 143 -		 -	def test_list(self): -		assert isinstance(Commit.list_items(self.rorepo, '0.1.5', max_count=5)['5117c9c8a4d3af19a9958677e45cda9269de1541'], Commit) +    def test_count(self): +        assert self.rorepo.tag('refs/tags/0.1.5').commit.count( ) == 143 +         +    def test_list(self): +        assert isinstance(Commit.list_items(self.rorepo, '0.1.5', max_count=5)['5117c9c8a4d3af19a9958677e45cda9269de1541'], Commit) -	def test_str(self): -		commit = Commit(self.rorepo, 'abc') -		assert_equal ("abc", str(commit)) +    def test_str(self): +        commit = Commit(self.rorepo, 'abc') +        assert_equal ("abc", str(commit)) -	def test_repr(self): -		commit = Commit(self.rorepo, 'abc') -		assert_equal('<git.Commit "abc">', repr(commit)) +    def test_repr(self): +        commit = Commit(self.rorepo, 'abc') +        assert_equal('<git.Commit "abc">', repr(commit)) -	def test_equality(self): -		commit1 = Commit(self.rorepo, 'abc') -		commit2 = Commit(self.rorepo, 'abc') -		commit3 = Commit(self.rorepo, 'zyx') -		assert_equal(commit1, commit2) -		assert_not_equal(commit2, commit3) -		 -	def test_iter_parents(self): -		# should return all but ourselves, even if skip is defined -		c = self.rorepo.commit('0.1.5') -		for skip in (0, 1): -			piter = c.iter_parents(skip=skip) -			first_parent = piter.next() -			assert first_parent != c -			assert first_parent == c.parents[0] -		# END for each  -		 -	def test_base(self): -		name_rev = self.rorepo.head.commit.name_rev -		assert isinstance(name_rev, basestring) -		 +    def test_equality(self): +        commit1 = Commit(self.rorepo, 'abc') +        commit2 = Commit(self.rorepo, 'abc') +        commit3 = Commit(self.rorepo, 'zyx') +        assert_equal(commit1, commit2) +        assert_not_equal(commit2, commit3) +         +    def test_iter_parents(self): +        # should return all but ourselves, even if skip is defined +        c = self.rorepo.commit('0.1.5') +        for skip in (0, 1): +            piter = c.iter_parents(skip=skip) +            first_parent = piter.next() +            assert first_parent != c +            assert first_parent == c.parents[0] +        # END for each  +         +    def test_base(self): +        name_rev = self.rorepo.head.commit.name_rev +        assert isinstance(name_rev, basestring) +         | 
