diff options
author | Michael Trier <mtrier@gmail.com> | 2010-03-03 23:46:23 -0500 |
---|---|---|
committer | Michael Trier <mtrier@gmail.com> | 2010-03-03 23:46:23 -0500 |
commit | e3e2c8c14b861b4d4865a9574e812ef9f2609771 (patch) | |
tree | c71c7da3843389ea3b7041a0200d7abe3b0e580d /test/git/test_tree.py | |
parent | acb0fa8b94ef421ad60c8507b634759a472cd56c (diff) | |
download | gitpython-e3e2c8c14b861b4d4865a9574e812ef9f2609771.tar.gz |
Corrected a bunch of whitespace that makes some folks crazy. Added Sebastian to the AUTHORS file.
Diffstat (limited to 'test/git/test_tree.py')
-rw-r--r-- | test/git/test_tree.py | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/test/git/test_tree.py b/test/git/test_tree.py index 947b0ffb..0ab6b9bc 100644 --- a/test/git/test_tree.py +++ b/test/git/test_tree.py @@ -1,5 +1,5 @@ # test_tree.py -# Copyright (C) 2008, 2009 Michael Trier (mtrier@gmail.com) and contributors +# Copyright (C) 2008-2010 Michael Trier (mtrier@gmail.com) and contributors # # This module is part of GitPython and is released under # the BSD License: http://www.opensource.org/licenses/bsd-license.php @@ -14,17 +14,17 @@ class TestTree(object): @patch_object(Git, '_call_process') def test_contents_should_cache(self, git): git.return_value = fixture('ls_tree_a') + fixture('ls_tree_b') - + tree = self.repo.tree('master') child = tree['grit'] child.items() child.items() - + assert_true(git.called) assert_equal(2, git.call_count) assert_equal(git.call_args, (('ls_tree', '34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {})) - + def test_content_from_string_tree_should_return_tree(self): text = fixture('ls_tree_a').splitlines()[-1] tree = Tree.content_from_string(None, text) @@ -33,23 +33,23 @@ class TestTree(object): assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44", tree.id) assert_equal("040000", tree.mode) assert_equal("test", tree.name) - + def test_content_from_string_tree_should_return_blob(self): text = fixture('ls_tree_b').split("\n")[0] - + tree = Tree.content_from_string(None, text) assert_equal(Blob, tree.__class__) assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb", tree.id) assert_equal("100644", tree.mode) assert_equal("grit.rb", tree.name) - + def test_content_from_string_tree_should_return_commit(self): text = fixture('ls_tree_commit').split("\n")[1] - + tree = Tree.content_from_string(None, text) assert_none(tree) - + @raises(TypeError) def test_content_from_string_invalid_type_should_raise(self): Tree.content_from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test") @@ -59,35 +59,35 @@ class TestTree(object): def test_slash(self, git, blob): git.return_value = fixture('ls_tree_a') blob.return_value = 1 - + tree = self.repo.tree('master') - + assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', (tree/'lib').id) assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id) - + assert_true(git.called) assert_equal(git.call_args, (('ls_tree', 'master'), {})) - + @patch_object(Blob, 'size') @patch_object(Git, '_call_process') def test_slash_with_zero_length_file(self, git, blob): git.return_value = fixture('ls_tree_a') blob.return_value = 0 - + tree = self.repo.tree('master') - + assert_not_none(tree/'README.txt') assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id) - + assert_true(git.called) assert_equal(git.call_args, (('ls_tree', 'master'), {})) - + @patch_object(Git, '_call_process') def test_slash_with_commits(self, git): git.return_value = fixture('ls_tree_commit') tree = self.repo.tree('master') - + assert_none(tree/'bar') assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id) assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id) |