← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

merge merge tweaks from aaron, which includes latest .dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
 
#! /usr/bin/python
2
 
 
3
1
import os
4
2
import unittest
5
3
 
6
 
from bzrlib.selftest import InTempDir, TestBase
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
5
from bzrlib.branch import ScratchBranch, Branch
8
6
from bzrlib.errors import NotBranchError, NotVersionedError
9
7
 
10
8
 
11
 
class Unknowns(InTempDir):
12
 
    def runTest(self):
13
 
        b = Branch('.', init=True)
 
9
class TestBranch(TestCaseInTempDir):
 
10
 
 
11
    def test_unknowns(self):
 
12
        b = Branch.initialize('.')
14
13
 
15
14
        self.build_tree(['hello.txt',
16
15
                         'hello.txt~'])
18
17
        self.assertEquals(list(b.unknowns()),
19
18
                          ['hello.txt'])
20
19
 
21
 
 
22
 
 
23
 
class NoChanges(InTempDir):
24
 
    def runTest(self):
 
20
    def test_no_changes(self):
25
21
        from bzrlib.errors import PointlessCommit
26
22
        
27
 
        b = Branch('.', init=True)
 
23
        b = Branch.initialize('.')
28
24
 
29
25
        self.build_tree(['hello.txt'])
30
26
 
55
51
        
56
52
 
57
53
 
58
 
class ValidateRevisionId(TestBase):
59
 
    def runTest(self):
 
54
class TestRevisionId(TestCase):
 
55
    
 
56
    def test_validate_revision_id(self):
60
57
        from bzrlib.revision import validate_revision_id
61
58
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
62
 
        
63
59
        self.assertRaises(ValueError,
64
60
                          validate_revision_id,
65
61
                          ' asdkjas')
66
 
 
67
 
 
68
62
        self.assertRaises(ValueError,
69
63
                          validate_revision_id,
70
64
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
71
 
 
72
 
 
73
65
        self.assertRaises(ValueError,
74
66
                          validate_revision_id,
75
67
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
76
 
 
77
68
        self.assertRaises(ValueError,
78
69
                          validate_revision_id,
79
70
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
80
71
 
81
72
 
 
73
class PendingMerges(TestCaseInTempDir):
82
74
 
83
 
class PendingMerges(InTempDir):
84
 
    """Tracking pending-merged revisions."""
85
 
    def runTest(self):
86
 
        b = Branch('.', init=True)
 
75
    def test_pending_merges(self):
 
76
        """Tracking pending-merged revisions."""
 
77
        b = Branch.initialize('.')
87
78
 
88
79
        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
 
 
 
80
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
81
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
83
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
98
84
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
99
85
        self.assertEquals(b.pending_merges(),
100
86
                          ['foo@azkhazan-123123-abcabc',
101
87
                           'wibble@fofof--20050401--1928390812'])
102
 
 
103
88
        b.commit("commit from base with two merges")
104
 
 
105
89
        rev = b.get_revision(b.revision_history()[0])
106
90
        self.assertEquals(len(rev.parents), 2)
107
91
        self.assertEquals(rev.parents[0].revision_id,
108
92
                          'foo@azkhazan-123123-abcabc')
109
93
        self.assertEquals(rev.parents[1].revision_id,
110
94
                           'wibble@fofof--20050401--1928390812')
111
 
 
112
95
        # list should be cleared when we do a commit
113
96
        self.assertEquals(b.pending_merges(), [])
114
97
        
115
 
        
116
 
        
117
 
 
118
 
class Revert(InTempDir):
119
 
    """Test selected-file revert"""
120
 
    def runTest(self):
121
 
        b = Branch('.', init=True)
 
98
    def test_revert(self):
 
99
        """Test selected-file revert"""
 
100
        b = Branch.initialize('.')
122
101
 
123
102
        self.build_tree(['hello.txt'])
124
103
        file('hello.txt', 'w').write('initial hello')
143
122
        self.check_file_contents('hello.txt', 'initial hello')
144
123
        self.check_file_contents('hello.txt~', 'initial hello')
145
124
 
146
 
 
147
 
 
148
 
class RenameDirs(InTempDir):
149
 
    """Test renaming directories and the files within them."""
150
 
    def runTest(self):
151
 
        b = Branch('.', init=True)
 
125
    def test_rename_dirs(self):
 
126
        """Test renaming directories and the files within them."""
 
127
        b = Branch.initialize('.')
152
128
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
129
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
154
130
 
176
152
                                   ['newdir', 'newdir/newsub',
177
153
                                    'newdir/newsub/file'])
178
154
 
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):
 
155
    def test_relpath(self):
 
156
        """test for branch path lookups
 
157
    
 
158
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
159
        job: given a path (either relative to cwd or absolute), work out
 
160
        if it is inside a branch and return the path relative to the base.
 
161
        """
191
162
        from bzrlib.branch import _relpath
192
163
        import tempfile, shutil
193
164
        
238
209
        finally:
239
210
            os.chdir(savedir)
240
211
            shutil.rmtree(dtmp)
241
 
 
242
 
 
243
 
 
244
 
 
245
 
TEST_CLASSES = [Unknowns,
246
 
                ValidateRevisionId,
247
 
                PendingMerges,
248
 
                Revert,
249
 
                RenameDirs,
250
 
                BranchPathTestCase,
251
 
                ]