FIxing unit tests that expect failures when trees with Submodules are traversed.

dvdotsenko · dvdotsenko · commit 13dda30f619b · 2010-10-29T22:21:39.000-07:00
diff --git a/lib/git/__init__.py b/lib/git/__init__.py
@@ -20,6 +20,7 @@
 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
@@ -92,7 +92,7 @@ def test_slash_with_commits(self, git):
 
         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 @@ def test_dict_with_commits(self, git):
 
         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 @@ def test_dict_with_non_existant_file(self, git):
         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')
