/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/per_tree/test_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_tree/test_tree.py
36
36
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'current:')()
37
37
        tree.lock_read()
38
38
        self.addCleanup(tree.unlock)
39
 
        a_id = tree.path2id('a')
40
 
        for revision, line in tree.annotate_iter(a_id):
 
39
        for revision, line in tree.annotate_iter('a'):
41
40
            self.assertEqual('contents of a\n', line)
42
41
            self.assertEqual(tree_revision, revision)
43
42
        tree_revision = getattr(tree, 'get_revision_id', lambda: 'random:')()
44
 
        for revision, line in tree.annotate_iter(a_id, 'random:'):
 
43
        for revision, line in tree.annotate_iter('a', default_revision='random:'):
45
44
            self.assertEqual('contents of a\n', line)
46
45
            self.assertEqual(tree_revision, revision)
47
46
 
100
99
        self.addCleanup(tree.unlock)
101
100
        path = tree.id2path('sub-root')
102
101
        self.assertEqual('sub-1',
103
 
            tree.get_reference_revision('sub-root', path))
 
102
            tree.get_reference_revision(path, 'sub-root'))
104
103
 
105
104
    def test_iter_references(self):
106
105
        tree = self.create_nested()
149
148
        tree = self.make_branch_and_tree('tree')
150
149
        work_tree = self.make_branch_and_tree('wt')
151
150
        tree = self.get_tree_no_parents_abc_content(work_tree)
152
 
        a_id = tree.path2id('a')
153
 
        b_id = tree.path2id('b')
154
151
        tree.lock_read()
155
152
        self.addCleanup(tree.unlock)
156
 
        self.assertEqual('file', tree.stored_kind(a_id))
157
 
        self.assertEqual('directory', tree.stored_kind(b_id))
 
153
        self.assertEqual('file', tree.stored_kind('a'))
 
154
        self.assertEqual('directory', tree.stored_kind('b'))
158
155
 
159
156
 
160
157
class TestFileContent(TestCaseWithTree):
166
163
        tree.lock_read()
167
164
        self.addCleanup(tree.unlock)
168
165
        # Test lookup without path works
169
 
        file_without_path = tree.get_file(a_id)
 
166
        file_without_path = tree.get_file('a')
170
167
        try:
171
168
            lines = file_without_path.readlines()
172
169
            self.assertEqual(['foobar\n'], lines)
173
170
        finally:
174
171
            file_without_path.close()
175
172
        # Test lookup with path works
176
 
        file_with_path = tree.get_file(a_id, path='a')
 
173
        file_with_path = tree.get_file('a', a_id)
177
174
        try:
178
175
            lines = file_with_path.readlines()
179
176
            self.assertEqual(['foobar\n'], lines)
187
184
        tree.lock_read()
188
185
        self.addCleanup(tree.unlock)
189
186
        # test read by file-id
190
 
        self.assertEqual('foobar\n', tree.get_file_text(a_id))
 
187
        self.assertEqual('foobar\n', tree.get_file_text('a', a_id))
191
188
        # test read by path
192
 
        self.assertEqual('foobar\n', tree.get_file_text(a_id, path='a'))
 
189
        self.assertEqual('foobar\n', tree.get_file_text('a'))
193
190
 
194
191
    def test_get_file_lines(self):
195
192
        work_tree = self.make_branch_and_tree('wt')
198
195
        tree.lock_read()
199
196
        self.addCleanup(tree.unlock)
200
197
        # test read by file-id
201
 
        self.assertEqual(['foobar\n'], tree.get_file_lines(a_id))
 
198
        self.assertEqual(['foobar\n'], tree.get_file_lines('a', a_id))
202
199
        # test read by path
203
 
        self.assertEqual(['foobar\n'], tree.get_file_lines(a_id, path='a'))
 
200
        self.assertEqual(['foobar\n'], tree.get_file_lines('a'))
204
201
 
205
202
    def test_get_file_lines_multi_line_breaks(self):
206
203
        work_tree = self.make_branch_and_tree('wt')
210
207
        tree.lock_read()
211
208
        self.addCleanup(tree.unlock)
212
209
        self.assertEqual(['a\rb\n', 'c\r\n', 'd'],
213
 
                         tree.get_file_lines(tree.path2id('foobar')))
 
210
                         tree.get_file_lines('foobar'))
214
211
 
215
212
 
216
213
class TestExtractFilesBytes(TestCaseWithTree):
324
321
        tree.lock_read()
325
322
        self.addCleanup(tree.unlock)
326
323
        expected = osutils.sha_strings('file content')
327
 
        self.assertEqual(expected, tree.get_file_sha1(tree.path2id('file')))
 
324
        self.assertEqual(expected, tree.get_file_sha1('file'))
328
325
 
329
326
 
330
327
class TestGetFileVerifier(TestCaseWithTree):
338
335
        tree = self._convert_tree(work_tree)
339
336
        tree.lock_read()
340
337
        self.addCleanup(tree.unlock)
341
 
        (kind, data) = tree.get_file_verifier(tree.path2id('file1'))
 
338
        (kind, data) = tree.get_file_verifier('file1')
342
339
        self.assertEqual(
343
 
            tree.get_file_verifier(tree.path2id('file1')),
344
 
            tree.get_file_verifier(tree.path2id('file2')))
 
340
            tree.get_file_verifier('file1'),
 
341
            tree.get_file_verifier('file2'))
345
342
        if kind == "SHA1":
346
343
            expected = osutils.sha_strings('file content')
347
344
            self.assertEqual(expected, data)