Skip to content

Commit 13dda30

Browse files
committed
FIxing unit tests that expect failures when trees with Submodules are traversed.
1 parent 61dbe88 commit 13dda30

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

lib/git/__init__.py

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from git.stats import Stats
2121
from git.tag import Tag
2222
from git.tree import Tree
23+
from git.submodule import Submodule
2324
from git.utils import dashify
2425
from git.utils import touch
2526

test/git/test_tree.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def test_slash_with_commits(self, git):
9292

9393
tree = self.repo.tree('master')
9494

95-
assert_none(tree/'bar')
95+
assert_equal('d35b34c6e931b9da8f6941007a92c9c9a9b0141a', (tree/'bar').id)
9696
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id)
9797
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id)
9898

@@ -133,7 +133,7 @@ def test_dict_with_commits(self, git):
133133

134134
tree = self.repo.tree('master')
135135

136-
assert_none(tree.get('bar'))
136+
assert_equal('d35b34c6e931b9da8f6941007a92c9c9a9b0141a', tree['bar'].id)
137137
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', tree['foo'].id)
138138
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', tree['baz'].id)
139139

@@ -146,7 +146,7 @@ def test_dict_with_non_existant_file(self, git):
146146
git.return_value = fixture('ls_tree_commit')
147147

148148
tree = self.repo.tree('master')
149-
tree['bar']
149+
tree['notthere']
150150

151151
def test_repr(self):
152152
tree = Tree(self.repo, id='abc')

0 commit comments

Comments
 (0)