/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/test_transform.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 15:19:49 UTC
  • mfrom: (7141.7.6 no-file-ids)
  • Revision ID: breezy.the.bot@gmail.com-20181116151949-hrmuv6s7ow1cqdhi
Drop file_id argument from read functions in Tree.

Merged from https://code.launchpad.net/~jelmer/brz/no-file-ids/+merge/357984

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
190
190
            orig(*args)
191
191
        self.wt._observed_sha1 = _observed_sha1
192
192
        trans.apply()
193
 
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
193
        self.assertEqual([('file1', trans._observed_sha1s[trans_id])],
194
194
                         calls)
195
195
 
196
196
    def test_create_file_caches_sha1(self):
2274
2274
        entry2_state = entry2[1][0]
2275
2275
        # Now, make sure that we don't have to re-read the content. The
2276
2276
        # packed_stat should match exactly.
2277
 
        self.assertEqual(entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2278
 
        self.assertEqual(entry2_sha,
2279
 
                         target.get_file_sha1('dir/file2', b'file2-id'))
 
2277
        self.assertEqual(entry1_sha, target.get_file_sha1('file1'))
 
2278
        self.assertEqual(entry2_sha, target.get_file_sha1('dir/file2'))
2280
2279
        self.assertEqual(entry1_state, entry1[1][0])
2281
2280
        self.assertEqual(entry2_state, entry2[1][0])
2282
2281
 
2352
2351
        rev = tt.commit(branch, 'message')
2353
2352
        tree = branch.basis_tree()
2354
2353
        self.assertEqual('file', tree.id2path(b'file-id'))
2355
 
        self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
 
2354
        self.assertEqual(b'contents', tree.get_file_text('file'))
2356
2355
        self.assertEqual('dir', tree.id2path(b'dir-id'))
2357
2356
        if SymlinkFeature.available():
2358
2357
            self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2743
2742
        preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2744
2743
        preview_tree = preview.get_preview_tree()
2745
2744
        self.assertEqual(preview_tree.kind('file2'), 'file')
2746
 
        with preview_tree.get_file('file2', b'file2-id') as f:
 
2745
        with preview_tree.get_file('file2') as f:
2747
2746
            self.assertEqual(f.read(), b'content B\n')
2748
2747
 
2749
2748
    def test_diff_preview_tree(self):
2839
2838
        limbo_path = preview._limbo_name(file_trans_id)
2840
2839
        preview_tree = preview.get_preview_tree()
2841
2840
        self.assertEqual(os.stat(limbo_path).st_mtime,
2842
 
                         preview_tree.get_file_mtime('file', b'file-id'))
 
2841
                         preview_tree.get_file_mtime('file'))
2843
2842
 
2844
2843
    def test_get_file_mtime_renamed(self):
2845
2844
        work_tree = self.make_branch_and_tree('tree')
2850
2849
        file_trans_id = preview.trans_id_tree_path('file')
2851
2850
        preview.adjust_path('renamed', preview.root, file_trans_id)
2852
2851
        preview_tree = preview.get_preview_tree()
2853
 
        preview_mtime = preview_tree.get_file_mtime('renamed', b'file-id')
2854
 
        work_mtime = work_tree.get_file_mtime('file', b'file-id')
 
2852
        preview_mtime = preview_tree.get_file_mtime('renamed')
 
2853
        work_mtime = work_tree.get_file_mtime('file')
2855
2854
 
2856
2855
    def test_get_file_size(self):
2857
2856
        work_tree = self.make_branch_and_tree('tree')
3305
3304
        self.addCleanup(preview.finalize)
3306
3305
        preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
3307
3306
        preview_tree = preview.get_preview_tree()
3308
 
        self.assertEqual(False, preview_tree.is_executable('tree/foo', b'baz-id'))
3309
3307
        self.assertEqual(False, preview_tree.is_executable('tree/foo'))
3310
3308
 
3311
3309
    def test_commit_preview_tree(self):