~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-07-07 10:22:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050707102201-2d2a13a25098b101
- rearrange and clear up merged weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#! /usr/bin/python
 
2
 
 
3
import os
 
4
import unittest
 
5
 
 
6
from bzrlib.selftest import InTempDir, TestBase
 
7
from bzrlib.branch import ScratchBranch, Branch
 
8
from bzrlib.errors import NotBranchError, NotVersionedError
 
9
 
 
10
 
 
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
 
 
22
 
 
23
class ValidateRevisionId(TestBase):
 
24
    def runTest(self):
 
25
        from bzrlib.revision import validate_revision_id
 
26
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
27
        
 
28
        self.assertRaises(ValueError,
 
29
                          validate_revision_id,
 
30
                          ' asdkjas')
 
31
 
 
32
 
 
33
        self.assertRaises(ValueError,
 
34
                          validate_revision_id,
 
35
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
36
 
 
37
 
 
38
        self.assertRaises(ValueError,
 
39
                          validate_revision_id,
 
40
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
41
 
 
42
        self.assertRaises(ValueError,
 
43
                          validate_revision_id,
 
44
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
45
 
 
46
 
 
47
 
 
48
class PendingMerges(InTempDir):
 
49
    """Tracking pending-merged revisions."""
 
50
    def runTest(self):
 
51
        b = Branch('.', init=True)
 
52
 
 
53
        self.assertEquals(b.pending_merges(), [])
 
54
        
 
55
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
56
        
 
57
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
58
    
 
59
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
60
        
 
61
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
62
 
 
63
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
64
        self.assertEquals(b.pending_merges(),
 
65
                          ['foo@azkhazan-123123-abcabc',
 
66
                           'wibble@fofof--20050401--1928390812'])
 
67
 
 
68
        b.commit("commit from base with two merges")
 
69
 
 
70
        rev = b.get_revision(b.revision_history()[0])
 
71
        self.assertEquals(len(rev.parents), 2)
 
72
        self.assertEquals(rev.parents[0].revision_id,
 
73
                          'foo@azkhazan-123123-abcabc')
 
74
        self.assertEquals(rev.parents[1].revision_id,
 
75
                           'wibble@fofof--20050401--1928390812')
 
76
 
 
77
        # list should be cleared when we do a commit
 
78
        self.assertEquals(b.pending_merges(), [])
 
79
        
 
80
        
 
81
        
 
82
 
 
83
class Revert(InTempDir):
 
84
    """Test selected-file revert"""
 
85
    def runTest(self):
 
86
        b = Branch('.', init=True)
 
87
 
 
88
        self.build_tree(['hello.txt'])
 
89
        file('hello.txt', 'w').write('initial hello')
 
90
 
 
91
        self.assertRaises(NotVersionedError,
 
92
                          b.revert, ['hello.txt'])
 
93
        
 
94
        b.add(['hello.txt'])
 
95
        b.commit('create initial hello.txt')
 
96
 
 
97
        self.check_file_contents('hello.txt', 'initial hello')
 
98
        file('hello.txt', 'w').write('new hello')
 
99
        self.check_file_contents('hello.txt', 'new hello')
 
100
 
 
101
        # revert file modified since last revision
 
102
        b.revert(['hello.txt'])
 
103
        self.check_file_contents('hello.txt', 'initial hello')
 
104
        self.check_file_contents('hello.txt~', 'new hello')
 
105
 
 
106
        # reverting again clobbers the backup
 
107
        b.revert(['hello.txt'])
 
108
        self.check_file_contents('hello.txt', 'initial hello')
 
109
        self.check_file_contents('hello.txt~', 'initial hello')
 
110
 
 
111
 
 
112
 
 
113
class RenameDirs(InTempDir):
 
114
    """Test renaming directories and the files within them."""
 
115
    def runTest(self):
 
116
        b = Branch('.', init=True)
 
117
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
 
118
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
 
119
 
 
120
        b.commit('create initial state')
 
121
 
 
122
        # TODO: lift out to a test helper that checks the shape of
 
123
        # an inventory
 
124
        
 
125
        revid = b.revision_history()[0]
 
126
        self.log('first revision_id is {%s}' % revid)
 
127
        
 
128
        inv = b.get_revision_inventory(revid)
 
129
        self.log('contents of inventory: %r' % inv.entries())
 
130
 
 
131
        self.check_inventory_shape(inv,
 
132
                                   ['dir', 'dir/sub', 'dir/sub/file'])
 
133
 
 
134
        b.rename_one('dir', 'newdir')
 
135
 
 
136
        self.check_inventory_shape(b.inventory,
 
137
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
 
138
 
 
139
        b.rename_one('newdir/sub', 'newdir/newsub')
 
140
        self.check_inventory_shape(b.inventory,
 
141
                                   ['newdir', 'newdir/newsub',
 
142
                                    'newdir/newsub/file'])
 
143
 
 
144
        
 
145
 
 
146
 
 
147
class BranchPathTestCase(TestBase):
 
148
    """test for branch path lookups
 
149
 
 
150
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
151
    job: given a path (either relative to cwd or absolute), work out
 
152
    if it is inside a branch and return the path relative to the base.
 
153
    """
 
154
 
 
155
    def runTest(self):
 
156
        from bzrlib.branch import _relpath
 
157
        import tempfile, shutil
 
158
        
 
159
        savedir = os.getcwdu()
 
160
        dtmp = tempfile.mkdtemp()
 
161
 
 
162
        def rp(p):
 
163
            return _relpath(dtmp, p)
 
164
        
 
165
        try:
 
166
            # check paths inside dtmp while standing outside it
 
167
            self.assertEqual(rp(os.path.join(dtmp, 'foo')), 'foo')
 
168
 
 
169
            # root = nothing
 
170
            self.assertEqual(rp(dtmp), '')
 
171
 
 
172
            self.assertRaises(NotBranchError,
 
173
                              rp,
 
174
                              '/etc')
 
175
 
 
176
            # now some near-miss operations -- note that
 
177
            # os.path.commonprefix gets these wrong!
 
178
            self.assertRaises(NotBranchError,
 
179
                              rp,
 
180
                              dtmp.rstrip('\\/') + '2')
 
181
 
 
182
            self.assertRaises(NotBranchError,
 
183
                              rp,
 
184
                              dtmp.rstrip('\\/') + '2/foo')
 
185
 
 
186
            # now operations based on relpath of files in current
 
187
            # directory, or nearby
 
188
            os.chdir(dtmp)
 
189
 
 
190
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
191
 
 
192
            self.assertEqual(rp('foo'), 'foo')
 
193
 
 
194
            self.assertEqual(rp('./foo'), 'foo')
 
195
 
 
196
            self.assertEqual(rp(os.path.abspath('foo')), 'foo')
 
197
 
 
198
            self.assertRaises(NotBranchError,
 
199
                              rp, '../foo')
 
200
 
 
201
        finally:
 
202
            os.chdir(savedir)
 
203
            shutil.rmtree(dtmp)
 
204
 
 
205
 
 
206
 
 
207
 
 
208
TEST_CLASSES = [Unknowns,
 
209
                ValidateRevisionId,
 
210
                PendingMerges,
 
211
                Revert,
 
212
                RenameDirs,
 
213
                BranchPathTestCase,
 
214
                ]