~bzr-pqm/bzr/bzr.dev

601 by Martin Pool
- whitebox tests for branch path handling
1
#! /usr/bin/python
2
768 by Martin Pool
- start some tests for directory renames
3
import os
4
import unittest
5
6
from bzrlib.selftest import InTempDir, TestBase
7
from bzrlib.branch import ScratchBranch, Branch
778 by Martin Pool
- simple revert of text files
8
from bzrlib.errors import NotBranchError, NotVersionedError
9
10
781 by Martin Pool
- start of simple test for unknown-file reporting
11
class Unknowns(InTempDir):
12
    def runTest(self):
13
        b = Branch('.', init=True)
14
15
        self.build_tree(['hello.txt',
16
                         'hello.txt~'])
17
18
        self.assertEquals(list(b.unknowns()),
19
                          ['hello.txt'])
20
21
811 by Martin Pool
- Test case for validate_revision_id
22
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
23
class NoChanges(InTempDir):
24
    def runTest(self):
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
25
        from bzrlib.errors import PointlessCommit
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
26
        
27
        b = Branch('.', init=True)
28
29
        self.build_tree(['hello.txt'])
30
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
31
        self.assertRaises(PointlessCommit,
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
32
                          b.commit,
33
                          'commit without adding',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
34
                          allow_pointless=False)
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
35
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
36
        b.commit('commit pointless tree',
37
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
38
39
        b.add('hello.txt')
40
        
41
        b.commit('commit first added file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
42
                 allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
43
        
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
44
        self.assertRaises(PointlessCommit,
883 by Martin Pool
- more tests for detecting empty commits
45
                          b.commit,
46
                          'commit after adding file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
47
                          allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
48
        
49
        b.commit('commit pointless revision with one file',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
50
                 allow_pointless=True)
883 by Martin Pool
- more tests for detecting empty commits
51
52
        b.add_pending_merge('mbp@892739123-2005-123123')
53
        b.commit('commit new merge with no text changes',
885 by Martin Pool
- commit command refuses unless something is changed or --unchanged is given
54
                 allow_pointless=False)
883 by Martin Pool
- more tests for detecting empty commits
55
        
882 by Martin Pool
- Optionally raise EmptyCommit if there are no changes. Test for this.
56
57
811 by Martin Pool
- Test case for validate_revision_id
58
class ValidateRevisionId(TestBase):
59
    def runTest(self):
60
        from bzrlib.revision import validate_revision_id
61
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
62
        
63
        self.assertRaises(ValueError,
64
                          validate_revision_id,
65
                          ' asdkjas')
66
67
68
        self.assertRaises(ValueError,
69
                          validate_revision_id,
70
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
71
72
73
        self.assertRaises(ValueError,
74
                          validate_revision_id,
75
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
76
77
        self.assertRaises(ValueError,
78
                          validate_revision_id,
79
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
80
81
82
815 by Martin Pool
- track pending-merges
83
class PendingMerges(InTempDir):
84
    """Tracking pending-merged revisions."""
85
    def runTest(self):
86
        b = Branch('.', init=True)
87
88
        self.assertEquals(b.pending_merges(), [])
89
        
90
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
91
        
92
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
93
    
94
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
95
        
96
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
97
98
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
99
        self.assertEquals(b.pending_merges(),
100
                          ['foo@azkhazan-123123-abcabc',
101
                           'wibble@fofof--20050401--1928390812'])
816 by Martin Pool
- don't write precursor field in new revision xml
102
103
        b.commit("commit from base with two merges")
104
105
        rev = b.get_revision(b.revision_history()[0])
106
        self.assertEquals(len(rev.parents), 2)
107
        self.assertEquals(rev.parents[0].revision_id,
108
                          'foo@azkhazan-123123-abcabc')
109
        self.assertEquals(rev.parents[1].revision_id,
110
                           'wibble@fofof--20050401--1928390812')
818 by Martin Pool
- Clear pending-merge list when committing.
111
112
        # list should be cleared when we do a commit
113
        self.assertEquals(b.pending_merges(), [])
114
        
816 by Martin Pool
- don't write precursor field in new revision xml
115
        
815 by Martin Pool
- track pending-merges
116
        
117
778 by Martin Pool
- simple revert of text files
118
class Revert(InTempDir):
119
    """Test selected-file revert"""
120
    def runTest(self):
121
        b = Branch('.', init=True)
122
123
        self.build_tree(['hello.txt'])
124
        file('hello.txt', 'w').write('initial hello')
125
126
        self.assertRaises(NotVersionedError,
127
                          b.revert, ['hello.txt'])
128
        
129
        b.add(['hello.txt'])
130
        b.commit('create initial hello.txt')
131
132
        self.check_file_contents('hello.txt', 'initial hello')
133
        file('hello.txt', 'w').write('new hello')
134
        self.check_file_contents('hello.txt', 'new hello')
135
136
        # revert file modified since last revision
137
        b.revert(['hello.txt'])
138
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
139
        self.check_file_contents('hello.txt~', 'new hello')
778 by Martin Pool
- simple revert of text files
140
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
141
        # reverting again clobbers the backup
778 by Martin Pool
- simple revert of text files
142
        b.revert(['hello.txt'])
143
        self.check_file_contents('hello.txt', 'initial hello')
782 by Martin Pool
- Branch.revert copies files to backups before reverting them
144
        self.check_file_contents('hello.txt~', 'initial hello')
778 by Martin Pool
- simple revert of text files
145
768 by Martin Pool
- start some tests for directory renames
146
147
148
class RenameDirs(InTempDir):
149
    """Test renaming directories and the files within them."""
150
    def runTest(self):
151
        b = Branch('.', init=True)
152
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
154
155
        b.commit('create initial state')
156
157
        # TODO: lift out to a test helper that checks the shape of
158
        # an inventory
159
        
160
        revid = b.revision_history()[0]
161
        self.log('first revision_id is {%s}' % revid)
162
        
163
        inv = b.get_revision_inventory(revid)
164
        self.log('contents of inventory: %r' % inv.entries())
165
166
        self.check_inventory_shape(inv,
167
                                   ['dir', 'dir/sub', 'dir/sub/file'])
168
771 by Martin Pool
- more tests of directory renames
169
        b.rename_one('dir', 'newdir')
170
171
        self.check_inventory_shape(b.inventory,
172
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
173
174
        b.rename_one('newdir/sub', 'newdir/newsub')
175
        self.check_inventory_shape(b.inventory,
176
                                   ['newdir', 'newdir/newsub',
177
                                    'newdir/newsub/file'])
178
768 by Martin Pool
- start some tests for directory renames
179
        
180
181
182
class BranchPathTestCase(TestBase):
601 by Martin Pool
- whitebox tests for branch path handling
183
    """test for branch path lookups
184
185
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
186
    job: given a path (either relative to cwd or absolute), work out
187
    if it is inside a branch and return the path relative to the base.
188
    """
768 by Martin Pool
- start some tests for directory renames
189
601 by Martin Pool
- whitebox tests for branch path handling
190
    def runTest(self):
191
        from bzrlib.branch import _relpath
192
        import tempfile, shutil
193
        
194
        savedir = os.getcwdu()
195
        dtmp = tempfile.mkdtemp()
910 by Martin Pool
patch from John
196
        # On Mac OSX, /tmp actually expands to /private/tmp
197
        dtmp = os.path.realpath(dtmp)
601 by Martin Pool
- whitebox tests for branch path handling
198
199
        def rp(p):
200
            return _relpath(dtmp, p)
201
        
202
        try:
203
            # check paths inside dtmp while standing outside it
204
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
205
206
            # root = nothing
207
            self.assertEqual(rp(dtmp), '')
208
209
            self.assertRaises(NotBranchError,
210
                              rp,
211
                              '/etc')
212
213
            # now some near-miss operations -- note that
214
            # os.path.commonprefix gets these wrong!
215
            self.assertRaises(NotBranchError,
216
                              rp,
217
                              dtmp.rstrip('\\/') + '2')
218
219
            self.assertRaises(NotBranchError,
220
                              rp,
221
                              dtmp.rstrip('\\/') + '2/foo')
222
223
            # now operations based on relpath of files in current
224
            # directory, or nearby
225
            os.chdir(dtmp)
226
227
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
228
229
            self.assertEqual(rp('foo'), 'foo')
230
231
            self.assertEqual(rp('./foo'), 'foo')
232
233
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
234
235
            self.assertRaises(NotBranchError,
236
                              rp, '../foo')
237
238
        finally:
239
            os.chdir(savedir)
240
            shutil.rmtree(dtmp)
843 by Martin Pool
- workaround for flaky TestLoader in python2.3
241
242
243
244
245
TEST_CLASSES = [Unknowns,
246
                ValidateRevisionId,
247
                PendingMerges,
248
                Revert,
249
                RenameDirs,
250
                BranchPathTestCase,
251
                ]