Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 7cdface

Browse filesBrowse files
ByronByron
committed
Removed plenty of mocked tree tests as they cannot work anymore with persistent commands that require stdin AND binary data - not even an adapter would help here. These tests will have to be replaced.
test_commit: Improved efficiency of traversal test
1 parent 2e6d110 commit 7cdface
Copy full SHA for 7cdface

2 files changed

+4-102Lines changed: 4 additions & 102 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎test/git/test_commit.py‎

Copy file name to clipboardExpand all lines: test/git/test_commit.py
+4-2Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,16 @@ def test_equality(self):
233233
def test_iteration(self):
234234
root = self.repo.tree()
235235
head = self.repo.active_branch
236+
head_commit = self.repo.active_branch.object
236237
num_objs = 0
237238

238239
# find the first commit containing the given path - always do a full
239240
# iteration ( restricted to the path in question ), but in fact it should
240241
# return quite a lot of commits, we just take one and hence abort the operation
242+
241243
for obj in root.traverse():
242244
num_objs += 1
243-
commit = Commit.iter_items( self.repo, head, obj.path ).next()
244-
assert obj in commit.tree.traverse()
245+
del( head_commit.tree ) # force it to clear the cache, just to make it harder
246+
assert obj in head_commit.tree.traverse()
245247
# END for each object
246248

Collapse file

‎test/git/test_tree.py‎

Copy file name to clipboardExpand all lines: test/git/test_tree.py
-100Lines changed: 0 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -12,36 +12,7 @@ class TestTree(TestCase):
1212
def setUp(self):
1313
self.repo = Repo(GIT_REPO)
1414

15-
@patch_object(Git, '_call_process')
16-
def test_contents_should_cache(self, git):
17-
git.return_value = fixture('ls_tree_a') + fixture('ls_tree_b')
1815

19-
tree = self.repo.tree(Head(self.repo,'master'))
20-
21-
child = tree['grit']
22-
len(child)
23-
len(child)
24-
25-
assert_true(git.called)
26-
assert_equal(2, git.call_count)
27-
assert_equal(git.call_args, (('ls_tree', '34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {}))
28-
29-
@raises(TypeError)
30-
def test__from_string_invalid_type_should_raise(self):
31-
Tree._from_string(None, "040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44 test")
32-
33-
@patch_object(Blob, 'size')
34-
@patch_object(Git, '_call_process')
35-
def test_slash(self, git, blob):
36-
git.return_value = fixture('ls_tree_a')
37-
blob.return_value = 1
38-
39-
tree = self.repo.tree(Head(self.repo,'master'))
40-
41-
assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', (tree/'lib').id)
42-
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
43-
44-
assert_true(git.called)
4516

4617
def test_traverse(self):
4718
root = self.repo.tree()
@@ -68,77 +39,6 @@ def test_traverse(self):
6839
assert len(set(trees)|set(root.trees)) == len(trees)
6940
assert len(set(b for b in root if isinstance(b, Blob)) | set(root.blobs)) == len( root.blobs )
7041

71-
@patch_object(Blob, 'size')
72-
@patch_object(Git, '_call_process')
73-
def test_slash_with_zero_length_file(self, git, blob):
74-
git.return_value = fixture('ls_tree_a')
75-
blob.return_value = 0
76-
77-
tree = self.repo.tree(Head(self.repo,'master'))
78-
79-
assert_not_none(tree/'README.txt')
80-
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', (tree/'README.txt').id)
81-
82-
assert_true(git.called)
83-
84-
@patch_object(Git, '_call_process')
85-
def test_slash_with_commits(self, git):
86-
git.return_value = fixture('ls_tree_commit')
87-
88-
tree = self.repo.tree(Head(self.repo,'master'))
89-
90-
self.failUnlessRaises(KeyError, tree.__div__, 'bar')
91-
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', (tree/'foo').id)
92-
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', (tree/'baz').id)
93-
94-
assert_true(git.called)
95-
96-
@patch_object(Blob, 'size')
97-
@patch_object(Git, '_call_process')
98-
def test_dict(self, git, blob):
99-
git.return_value = fixture('ls_tree_a')
100-
blob.return_value = 1
101-
102-
tree = self.repo.tree(Head(self.repo,'master'))
103-
104-
assert_equal('aa06ba24b4e3f463b3c4a85469d0fb9e5b421cf8', tree['lib'].id)
105-
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
106-
107-
assert_true(git.called)
108-
109-
@patch_object(Blob, 'size')
110-
@patch_object(Git, '_call_process')
111-
def test_dict_with_zero_length_file(self, git, blob):
112-
git.return_value = fixture('ls_tree_a')
113-
blob.return_value = 0
114-
115-
tree = self.repo.tree(Head(self.repo,'master'))
116-
117-
assert_not_none(tree['README.txt'])
118-
assert_equal('8b1e02c0fb554eed2ce2ef737a68bb369d7527df', tree['README.txt'].id)
119-
120-
assert_true(git.called)
121-
122-
@patch_object(Git, '_call_process')
123-
def test_dict_with_commits(self, git):
124-
git.return_value = fixture('ls_tree_commit')
125-
126-
tree = self.repo.tree(Head(self.repo,'master'))
127-
128-
self.failUnlessRaises(KeyError, tree.__getitem__, 'bar')
129-
assert_equal('2afb47bcedf21663580d5e6d2f406f08f3f65f19', tree['foo'].id)
130-
assert_equal('f623ee576a09ca491c4a27e48c0dfe04be5f4a2e', tree['baz'].id)
131-
132-
assert_true(git.called)
133-
134-
@patch_object(Git, '_call_process')
135-
@raises(KeyError)
136-
def test_dict_with_non_existant_file(self, git):
137-
git.return_value = fixture('ls_tree_commit')
138-
139-
tree = self.repo.tree(Head(self.repo,'master'))
140-
tree['bar']
141-
14242
def test_repr(self):
14343
tree = Tree(self.repo, id='abc')
14444
assert_equal('<git.Tree "abc">', repr(tree))

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.