/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: Jelmer Vernooij
  • Date: 2017-11-12 20:07:32 UTC
  • mto: This revision was merged to the branch mainline in revision 6819.
  • Revision ID: jelmer@jelmer.uk-20171112200732-ehxgen03s9jphe8n
Swap arguments for get_symlink_target and kind/stored_kind.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_transform.py
1533
1533
        self.assertPathExists("foo/bar")
1534
1534
        wt.lock_read()
1535
1535
        try:
1536
 
            self.assertEqual(wt.kind(wt.path2id("foo")), "directory")
 
1536
            self.assertEqual(wt.kind("foo"), "directory")
1537
1537
        finally:
1538
1538
            wt.unlock()
1539
1539
        wt.commit("two")
1555
1555
        self.assertPathExists("foo")
1556
1556
        wt.lock_read()
1557
1557
        self.addCleanup(wt.unlock)
1558
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "symlink")
 
1558
        self.assertEqual(wt.kind("foo"), "symlink")
1559
1559
 
1560
1560
    def test_dir_to_file(self):
1561
1561
        wt = self.make_branch_and_tree('.')
1573
1573
        self.assertPathExists("foo")
1574
1574
        wt.lock_read()
1575
1575
        self.addCleanup(wt.unlock)
1576
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
 
1576
        self.assertEqual(wt.kind("foo"), "file")
1577
1577
 
1578
1578
    def test_dir_to_hardlink(self):
1579
1579
        self.requireFeature(HardlinkFeature)
1594
1594
        self.assertPathExists("baz")
1595
1595
        wt.lock_read()
1596
1596
        self.addCleanup(wt.unlock)
1597
 
        self.assertEqual(wt.kind(wt.path2id("foo")), "file")
 
1597
        self.assertEqual(wt.kind("foo"), "file")
1598
1598
 
1599
1599
    def test_no_final_path(self):
1600
1600
        transform, root = self.get_transform()
1610
1610
        tree2 = self.make_branch_and_tree('tree2')
1611
1611
        tt = TreeTransform(tree2)
1612
1612
        foo_trans_id = tt.create_path('foo', tt.root)
1613
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1613
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id')
1614
1614
        bar_trans_id = tt.create_path('bar', tt.root)
1615
 
        create_from_tree(tt, bar_trans_id, tree1, 'bar-id')
 
1615
        create_from_tree(tt, bar_trans_id, tree1, 'bar', file_id='bar-id')
1616
1616
        tt.apply()
1617
1617
        self.assertEqual('directory', osutils.file_kind('tree2/foo'))
1618
1618
        self.assertFileEqual('baz', 'tree2/bar')
1625
1625
        tree2 = self.make_branch_and_tree('tree2')
1626
1626
        tt = TreeTransform(tree2)
1627
1627
        foo_trans_id = tt.create_path('foo', tt.root)
1628
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id', bytes='qux')
 
1628
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id',
 
1629
                         bytes='qux')
1629
1630
        tt.apply()
1630
1631
        self.assertFileEqual('qux', 'tree2/foo')
1631
1632
 
1636
1637
        tree1.add('foo', 'foo-id')
1637
1638
        tt = TreeTransform(self.make_branch_and_tree('tree2'))
1638
1639
        foo_trans_id = tt.create_path('foo', tt.root)
1639
 
        create_from_tree(tt, foo_trans_id, tree1, 'foo-id')
 
1640
        create_from_tree(tt, foo_trans_id, tree1, 'foo', file_id='foo-id')
1640
1641
        tt.apply()
1641
1642
        self.assertEqual('bar', os.readlink('tree2/foo'))
1642
1643
 
2349
2350
        self.assertEqual('dir', tree.id2path('dir-id'))
2350
2351
        if SymlinkFeature.available():
2351
2352
            self.assertEqual('dir/symlink', tree.id2path('symlink-id'))
2352
 
            self.assertEqual('target', tree.get_symlink_target('symlink-id'))
 
2353
            self.assertEqual('target', tree.get_symlink_target('dir/symlink'))
2353
2354
 
2354
2355
    def test_add_unversioned(self):
2355
2356
        branch, tt = self.get_branch_and_transform()
2731
2732
        self.addCleanup(preview.finalize)
2732
2733
        preview.new_file('file2', preview.root, 'content B\n', 'file2-id')
2733
2734
        preview_tree = preview.get_preview_tree()
2734
 
        self.assertEqual(preview_tree.kind('file2-id'), 'file')
 
2735
        self.assertEqual(preview_tree.kind('file2'), 'file')
2735
2736
        self.assertEqual(
2736
2737
            preview_tree.get_file('file2', 'file2-id').read(), 'content B\n')
2737
2738
 
2818
2819
        preview.new_file('file', preview.root, 'contents', 'file-id')
2819
2820
        preview.new_directory('directory', preview.root, 'dir-id')
2820
2821
        preview_tree = preview.get_preview_tree()
2821
 
        self.assertEqual('file', preview_tree.kind('file-id'))
2822
 
        self.assertEqual('directory', preview_tree.kind('dir-id'))
 
2822
        self.assertEqual('file', preview_tree.kind('file'))
 
2823
        self.assertEqual('directory', preview_tree.kind('directory'))
2823
2824
 
2824
2825
    def test_get_file_mtime(self):
2825
2826
        preview = self.get_empty_preview()
2870
2871
        preview.new_symlink('symlink', preview.root, 'target', 'symlink-id')
2871
2872
        preview_tree = preview.get_preview_tree()
2872
2873
        self.assertEqual('target',
2873
 
                         preview_tree.get_symlink_target('symlink-id'))
 
2874
                         preview_tree.get_symlink_target('symlink'))
2874
2875
 
2875
2876
    def test_all_file_ids(self):
2876
2877
        tree = self.make_branch_and_tree('tree')
3124
3125
        preview = self.get_empty_preview()
3125
3126
        preview.new_file('file', preview.root, 'a\nb\nc\n', 'file-id')
3126
3127
        preview_tree = preview.get_preview_tree()
3127
 
        self.assertEqual('file', preview_tree.stored_kind('file-id'))
 
3128
        self.assertEqual('file', preview_tree.stored_kind('file'))
3128
3129
 
3129
3130
    def test_is_executable(self):
3130
3131
        preview = self.get_empty_preview()