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

  • Committer: Vincent Ladeuil
  • Date: 2010-10-15 12:35:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5502.
  • Revision ID: v.ladeuil+lp@free.fr-20101015123500-iyqj7e0r62ie6qfy
Unbreak pqm by commenting out the bogus use of doctest +SKIP not supported by python2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
25
25
    filters,
26
26
    generate_ids,
27
27
    osutils,
28
 
    progress,
29
28
    revision as _mod_revision,
30
29
    rules,
31
30
    tests,
32
31
    urlutils,
33
32
    )
34
33
from bzrlib.bzrdir import BzrDir
35
 
from bzrlib.conflicts import (DuplicateEntry, DuplicateID, MissingParent,
36
 
                              UnversionedParent, ParentLoop, DeletingParent,
37
 
                              NonDirectoryParent)
 
34
from bzrlib.conflicts import (
 
35
    DeletingParent,
 
36
    DuplicateEntry,
 
37
    DuplicateID,
 
38
    MissingParent,
 
39
    NonDirectoryParent,
 
40
    ParentLoop,
 
41
    UnversionedParent,
 
42
)
38
43
from bzrlib.diff import show_diff_trees
39
 
from bzrlib.errors import (DuplicateKey, MalformedTransform, NoSuchFile,
40
 
                           ReusingTransform, CantMoveRoot,
41
 
                           PathsNotVersionedError, ExistingLimbo,
42
 
                           ExistingPendingDeletion, ImmortalLimbo,
43
 
                           ImmortalPendingDeletion, LockError)
44
 
from bzrlib.osutils import file_kind, pathjoin
 
44
from bzrlib.errors import (
 
45
    DuplicateKey,
 
46
    ExistingLimbo,
 
47
    ExistingPendingDeletion,
 
48
    ImmortalLimbo,
 
49
    ImmortalPendingDeletion,
 
50
    LockError,
 
51
    MalformedTransform,
 
52
    NoSuchFile,
 
53
    ReusingTransform,
 
54
)
 
55
from bzrlib.osutils import (
 
56
    file_kind,
 
57
    pathjoin,
 
58
)
45
59
from bzrlib.merge import Merge3Merger, Merger
46
60
from bzrlib.tests import (
 
61
    features,
47
62
    HardlinkFeature,
48
63
    SymlinkFeature,
49
64
    TestCase,
50
65
    TestCaseInTempDir,
51
66
    TestSkipped,
52
 
    )
53
 
from bzrlib.transform import (TreeTransform, ROOT_PARENT, FinalPaths,
54
 
                              resolve_conflicts, cook_conflicts,
55
 
                              build_tree, get_backup_name,
56
 
                              _FileMover, resolve_checkout,
57
 
                              TransformPreview, create_from_tree)
 
67
)
 
68
from bzrlib.transform import (
 
69
    build_tree,
 
70
    create_from_tree,
 
71
    cook_conflicts,
 
72
    _FileMover,
 
73
    FinalPaths,
 
74
    get_backup_name,
 
75
    resolve_conflicts,
 
76
    resolve_checkout,
 
77
    ROOT_PARENT,
 
78
    TransformPreview,
 
79
    TreeTransform,
 
80
)
58
81
 
59
82
 
60
83
class TestTreeTransform(tests.TestCaseWithTransport):
101
124
        imaginary_id = transform.trans_id_tree_path('imaginary')
102
125
        imaginary_id2 = transform.trans_id_tree_path('imaginary/')
103
126
        self.assertEqual(imaginary_id, imaginary_id2)
104
 
        self.assertEqual(transform.get_tree_parent(imaginary_id), root)
105
 
        self.assertEqual(transform.final_kind(root), 'directory')
106
 
        self.assertEqual(transform.final_file_id(root), self.wt.get_root_id())
 
127
        self.assertEqual(root, transform.get_tree_parent(imaginary_id))
 
128
        self.assertEqual('directory', transform.final_kind(root))
 
129
        self.assertEqual(self.wt.get_root_id(), transform.final_file_id(root))
107
130
        trans_id = transform.create_path('name', root)
108
131
        self.assertIs(transform.final_file_id(trans_id), None)
109
 
        self.assertRaises(NoSuchFile, transform.final_kind, trans_id)
 
132
        self.assertIs(None, transform.final_kind(trans_id))
110
133
        transform.create_file('contents', trans_id)
111
134
        transform.set_executability(True, trans_id)
112
135
        transform.version_file('my_pretties', trans_id)
830
853
        rename.set_executability(True, myfile)
831
854
        rename.apply()
832
855
 
 
856
    def test_rename_fails(self):
 
857
        self.requireFeature(features.not_running_as_root)
 
858
        # see https://bugs.launchpad.net/bzr/+bug/491763
 
859
        create, root_id = self.get_transform()
 
860
        first_dir = create.new_directory('first-dir', root_id, 'first-id')
 
861
        myfile = create.new_file('myfile', root_id, 'myfile-text',
 
862
                                 'myfile-id')
 
863
        create.apply()
 
864
        if os.name == "posix" and sys.platform != "cygwin":
 
865
            # posix filesystems fail on renaming if the readonly bit is set
 
866
            osutils.make_readonly(self.wt.abspath('first-dir'))
 
867
        elif os.name == "nt":
 
868
            # windows filesystems fail on renaming open files
 
869
            self.addCleanup(file(self.wt.abspath('myfile')).close)
 
870
        else:
 
871
            self.skip("Don't know how to force a permissions error on rename")
 
872
        # now transform to rename
 
873
        rename_transform, root_id = self.get_transform()
 
874
        file_trans_id = rename_transform.trans_id_file_id('myfile-id')
 
875
        dir_id = rename_transform.trans_id_file_id('first-id')
 
876
        rename_transform.adjust_path('newname', dir_id, file_trans_id)
 
877
        e = self.assertRaises(errors.TransformRenameFailed,
 
878
            rename_transform.apply)
 
879
        # On nix looks like: 
 
880
        # "Failed to rename .../work/.bzr/checkout/limbo/new-1
 
881
        # to .../first-dir/newname: [Errno 13] Permission denied"
 
882
        # On windows looks like:
 
883
        # "Failed to rename .../work/myfile to 
 
884
        # .../work/.bzr/checkout/limbo/new-1: [Errno 13] Permission denied"
 
885
        # The strerror will vary per OS and language so it's not checked here
 
886
        self.assertContainsRe(str(e),
 
887
            "Failed to rename .*(first-dir.newname:|myfile)")
 
888
 
833
889
    def test_set_executability_order(self):
834
890
        """Ensure that executability behaves the same, no matter what order.
835
891
 
2091
2147
        self.assertRaises(errors.MalformedTransform, tt.commit, branch,
2092
2148
                          'message')
2093
2149
 
 
2150
    def test_commit_rich_revision_data(self):
 
2151
        branch, tt = self.get_branch_and_transform()
 
2152
        rev_id = tt.commit(branch, 'message', timestamp=1, timezone=43201,
 
2153
                           committer='me <me@example.com>',
 
2154
                           revprops={'foo': 'bar'}, revision_id='revid-1',
 
2155
                           authors=['Author1 <author1@example.com>',
 
2156
                              'Author2 <author2@example.com>',
 
2157
                               ])
 
2158
        self.assertEqual('revid-1', rev_id)
 
2159
        revision = branch.repository.get_revision(rev_id)
 
2160
        self.assertEqual(1, revision.timestamp)
 
2161
        self.assertEqual(43201, revision.timezone)
 
2162
        self.assertEqual('me <me@example.com>', revision.committer)
 
2163
        self.assertEqual(['Author1 <author1@example.com>',
 
2164
                          'Author2 <author2@example.com>'],
 
2165
                         revision.get_apparent_authors())
 
2166
        del revision.properties['authors']
 
2167
        self.assertEqual({'foo': 'bar',
 
2168
                          'branch-nick': 'tree'},
 
2169
                         revision.properties)
 
2170
 
 
2171
    def test_no_explicit_revprops(self):
 
2172
        branch, tt = self.get_branch_and_transform()
 
2173
        rev_id = tt.commit(branch, 'message', authors=[
 
2174
            'Author1 <author1@example.com>',
 
2175
            'Author2 <author2@example.com>', ])
 
2176
        revision = branch.repository.get_revision(rev_id)
 
2177
        self.assertEqual(['Author1 <author1@example.com>',
 
2178
                          'Author2 <author2@example.com>'],
 
2179
                         revision.get_apparent_authors())
 
2180
        self.assertEqual('tree', revision.properties['branch-nick'])
 
2181
 
2094
2182
 
2095
2183
class MockTransform(object):
2096
2184