/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

Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
191
191
            orig(*args)
192
192
        self.wt._observed_sha1 = _observed_sha1
193
193
        trans.apply()
194
 
        self.assertEqual([(None, 'file1', trans._observed_sha1s[trans_id])],
 
194
        self.assertEqual([('file1', trans._observed_sha1s[trans_id])],
195
195
                         calls)
196
196
 
197
197
    def test_create_file_caches_sha1(self):
2319
2319
        entry2_state = entry2[1][0]
2320
2320
        # Now, make sure that we don't have to re-read the content. The
2321
2321
        # packed_stat should match exactly.
2322
 
        self.assertEqual(
2323
 
            entry1_sha, target.get_file_sha1('file1', b'file1-id'))
2324
 
        self.assertEqual(entry2_sha,
2325
 
                         target.get_file_sha1('dir/file2', b'file2-id'))
 
2322
        self.assertEqual(entry1_sha, target.get_file_sha1('file1'))
 
2323
        self.assertEqual(entry2_sha, target.get_file_sha1('dir/file2'))
2326
2324
        self.assertEqual(entry1_state, entry1[1][0])
2327
2325
        self.assertEqual(entry2_state, entry2[1][0])
2328
2326
 
2398
2396
        tt.commit(branch, 'message')
2399
2397
        tree = branch.basis_tree()
2400
2398
        self.assertEqual('file', tree.id2path(b'file-id'))
2401
 
        self.assertEqual(b'contents', tree.get_file_text('file', b'file-id'))
 
2399
        self.assertEqual(b'contents', tree.get_file_text('file'))
2402
2400
        self.assertEqual('dir', tree.id2path(b'dir-id'))
2403
2401
        if SymlinkFeature.available():
2404
2402
            self.assertEqual('dir/symlink', tree.id2path(b'symlink-id'))
2793
2791
        preview.new_file('file2', preview.root, [b'content B\n'], b'file2-id')
2794
2792
        preview_tree = preview.get_preview_tree()
2795
2793
        self.assertEqual(preview_tree.kind('file2'), 'file')
2796
 
        with preview_tree.get_file('file2', b'file2-id') as f:
 
2794
        with preview_tree.get_file('file2') as f:
2797
2795
            self.assertEqual(f.read(), b'content B\n')
2798
2796
 
2799
2797
    def test_diff_preview_tree(self):
2887
2885
        limbo_path = preview._limbo_name(file_trans_id)
2888
2886
        preview_tree = preview.get_preview_tree()
2889
2887
        self.assertEqual(os.stat(limbo_path).st_mtime,
2890
 
                         preview_tree.get_file_mtime('file', b'file-id'))
 
2888
                         preview_tree.get_file_mtime('file'))
2891
2889
 
2892
2890
    def test_get_file_mtime_renamed(self):
2893
2891
        work_tree = self.make_branch_and_tree('tree')
2898
2896
        file_trans_id = preview.trans_id_tree_path('file')
2899
2897
        preview.adjust_path('renamed', preview.root, file_trans_id)
2900
2898
        preview_tree = preview.get_preview_tree()
2901
 
        preview_tree.get_file_mtime('renamed', b'file-id')
2902
 
        work_tree.get_file_mtime('file', b'file-id')
 
2899
        preview_mtime = preview_tree.get_file_mtime('renamed')
 
2900
        work_mtime = work_tree.get_file_mtime('file')
2903
2901
 
2904
2902
    def test_get_file_size(self):
2905
2903
        work_tree = self.make_branch_and_tree('tree')
3357
3355
        self.addCleanup(preview.finalize)
3358
3356
        preview.new_file('foo', preview.root, [b'bar'], b'baz-id')
3359
3357
        preview_tree = preview.get_preview_tree()
3360
 
        self.assertEqual(
3361
 
            False, preview_tree.is_executable('tree/foo', b'baz-id'))
3362
3358
        self.assertEqual(False, preview_tree.is_executable('tree/foo'))
3363
3359
 
3364
3360
    def test_commit_preview_tree(self):