summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD.Dotsenko <dotsa@hotmail.com>2010-10-29 22:21:39 -0700
committerD.Dotsenko <dotsa@hotmail.com>2010-10-29 22:21:39 -0700
commit13dda30f619bb108260dd1c423fdcc3624e32a6c (patch)
treeadec32063bc9864ef11abb663c1ca8b0798719ce
parent61dbe884a2b11a53b7a6c774da2560c1c776c4de (diff)
downloadgitpython-13dda30f619bb108260dd1c423fdcc3624e32a6c.tar.gz
FIxing unit tests that expect failures when trees with Submodules are traversed.
-rw-r--r--lib/git/__init__.py1
-rw-r--r--test/git/test_tree.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/git/__init__.py b/lib/git/__init__.py
index 393fb8a4..6eeb3502 100644
--- a/lib/git/__init__.py
+++ b/lib/git/__init__.py
@@ -20,6 +20,7 @@ from git.repo import Repo
from git.stats import Stats
from git.tag import Tag
from git.tree import Tree
+from git.submodule import Submodule
from git.utils import dashify
from git.utils import touch
diff --git a/test/git/test_tree.py b/test/git/test_tree.py
index 6d6a72c6..abcdbda5 100644
--- a/test/git/test_tree.py
+++ b/test/git/test_tree.py
@@ -92,7 +92,7 @@ class TestTree(object):
tree = self.repo.tree('master')
- assert_none(tree/'bar')
+ assert_equal('d35b34c6e931b9da8f6941007a92c9c9a9b0141a', (tree/'bar').id)
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id)
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id)
@@ -133,7 +133,7 @@ class TestTree(object):
tree = self.repo.tree('master')
- assert_none(tree.get('bar'))
+ assert_equal('d35b34c6e931b9da8f6941007a92c9c9a9b0141a', tree['bar'].id)
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', tree['foo'].id)
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', tree['baz'].id)
@@ -146,7 +146,7 @@ class TestTree(object):
git.return_value = fixture('ls_tree_commit')
tree = self.repo.tree('master')
- tree['bar']
+ tree['notthere']
def test_repr(self):
tree = Tree(self.repo, id='abc')