← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-08-18 05:52:29 UTC
  • Revision ID: mbp@sourcefrog.net-20050818055229-cac46ebce364d04c
- avoid compiling REs at module load time

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
 
1
#! /usr/bin/python
 
2
 
1
3
import os
2
4
import unittest
3
5
 
4
 
from bzrlib.selftest import TestCaseInTempDir, TestCase
 
6
from bzrlib.selftest import InTempDir, TestBase
5
7
from bzrlib.branch import ScratchBranch, Branch
6
8
from bzrlib.errors import NotBranchError, NotVersionedError
7
9
 
8
10
 
9
 
class TestBranch(TestCaseInTempDir):
10
 
 
11
 
    def test_unknowns(self):
12
 
        b = Branch.initialize('.')
 
11
class Unknowns(InTempDir):
 
12
    def runTest(self):
 
13
        b = Branch('.', init=True)
13
14
 
14
15
        self.build_tree(['hello.txt',
15
16
                         'hello.txt~'])
17
18
        self.assertEquals(list(b.unknowns()),
18
19
                          ['hello.txt'])
19
20
 
20
 
    def test_no_changes(self):
 
21
 
 
22
 
 
23
class NoChanges(InTempDir):
 
24
    def runTest(self):
21
25
        from bzrlib.errors import PointlessCommit
22
26
        
23
 
        b = Branch.initialize('.')
 
27
        b = Branch('.', init=True)
24
28
 
25
29
        self.build_tree(['hello.txt'])
26
30
 
45
49
        b.commit('commit pointless revision with one file',
46
50
                 allow_pointless=True)
47
51
 
48
 
 
49
 
class MoreTests(TestCaseInTempDir):
50
 
 
51
 
    def test_revert(self):
52
 
        """Test selected-file revert"""
53
 
        b = Branch.initialize('.')
 
52
        b.add_pending_merge('mbp@892739123-2005-123123')
 
53
        b.commit('commit new merge with no text changes',
 
54
                 allow_pointless=False)
 
55
        
 
56
 
 
57
 
 
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
 
 
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'])
 
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')
 
111
 
 
112
        # list should be cleared when we do a commit
 
113
        self.assertEquals(b.pending_merges(), [])
 
114
        
 
115
        
 
116
        
 
117
 
 
118
class Revert(InTempDir):
 
119
    """Test selected-file revert"""
 
120
    def runTest(self):
 
121
        b = Branch('.', init=True)
54
122
 
55
123
        self.build_tree(['hello.txt'])
56
124
        file('hello.txt', 'w').write('initial hello')
75
143
        self.check_file_contents('hello.txt', 'initial hello')
76
144
        self.check_file_contents('hello.txt~', 'initial hello')
77
145
 
78
 
    def test_rename_dirs(self):
79
 
        """Test renaming directories and the files within them."""
80
 
        b = Branch.initialize('.')
 
146
 
 
147
 
 
148
class RenameDirs(InTempDir):
 
149
    """Test renaming directories and the files within them."""
 
150
    def runTest(self):
 
151
        b = Branch('.', init=True)
81
152
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
82
153
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
83
154
 
97
168
 
98
169
        b.rename_one('dir', 'newdir')
99
170
 
100
 
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
 
171
        self.check_inventory_shape(b.inventory,
101
172
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
102
173
 
103
174
        b.rename_one('newdir/sub', 'newdir/newsub')
104
 
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
 
175
        self.check_inventory_shape(b.inventory,
105
176
                                   ['newdir', 'newdir/newsub',
106
177
                                    'newdir/newsub/file'])
107
178
 
108
 
    def test_relpath(self):
109
 
        """test for branch path lookups
110
 
    
111
 
        bzrlib.osutils._relpath do a simple but subtle
112
 
        job: given a path (either relative to cwd or absolute), work out
113
 
        if it is inside a branch and return the path relative to the base.
114
 
        """
115
 
        from bzrlib.osutils import relpath
 
179
        
 
180
 
 
181
 
 
182
class BranchPathTestCase(TestBase):
 
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
    """
 
189
 
 
190
    def runTest(self):
 
191
        from bzrlib.branch import _relpath
116
192
        import tempfile, shutil
117
193
        
118
194
        savedir = os.getcwdu()
121
197
        dtmp = os.path.realpath(dtmp)
122
198
 
123
199
        def rp(p):
124
 
            return relpath(dtmp, p)
 
200
            return _relpath(dtmp, p)
125
201
        
126
202
        try:
127
203
            # check paths inside dtmp while standing outside it
148
224
            # directory, or nearby
149
225
            os.chdir(dtmp)
150
226
 
151
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
152
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
227
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
153
228
 
154
229
            self.assertEqual(rp('foo'), 'foo')
155
230
 
163
238
        finally:
164
239
            os.chdir(savedir)
165
240
            shutil.rmtree(dtmp)
 
241
 
 
242
 
 
243
 
 
244
 
 
245
TEST_CLASSES = [Unknowns,
 
246
                ValidateRevisionId,
 
247
                PendingMerges,
 
248
                Revert,
 
249
                RenameDirs,
 
250
                BranchPathTestCase,
 
251
                ]