/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/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-09-16 06:51:44 UTC
  • Revision ID: mbp@sourcefrog.net-20050916065144-dbf04063a4b635b6
- pointless commit of r1 no longer allowed
  (same behaviour as with old commit code)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
3
3
import os
4
4
import unittest
5
5
 
6
 
from bzrlib.selftest import InTempDir, TestBase
 
6
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
7
from bzrlib.branch import ScratchBranch, Branch
8
8
from bzrlib.errors import NotBranchError, NotVersionedError
9
9
 
10
10
 
11
 
class Unknowns(InTempDir):
12
 
    def runTest(self):
 
11
class TestBranch(TestCaseInTempDir):
 
12
 
 
13
    def test_unknowns(self):
13
14
        b = Branch('.', init=True)
14
15
 
15
16
        self.build_tree(['hello.txt',
18
19
        self.assertEquals(list(b.unknowns()),
19
20
                          ['hello.txt'])
20
21
 
21
 
 
22
 
 
23
 
class NoChanges(InTempDir):
24
 
    def runTest(self):
 
22
    def test_no_changes(self):
25
23
        from bzrlib.errors import PointlessCommit
26
24
        
27
25
        b = Branch('.', init=True)
28
 
 
29
26
        self.build_tree(['hello.txt'])
30
27
 
31
28
        self.assertRaises(PointlessCommit,
55
52
        
56
53
 
57
54
 
58
 
class ValidateRevisionId(TestBase):
59
 
    def runTest(self):
 
55
class TestRevisionId(TestCase):
 
56
    
 
57
    def test_validate_revision_id(self):
60
58
        from bzrlib.revision import validate_revision_id
61
59
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
62
 
        
63
60
        self.assertRaises(ValueError,
64
61
                          validate_revision_id,
65
62
                          ' asdkjas')
66
 
 
67
 
 
68
63
        self.assertRaises(ValueError,
69
64
                          validate_revision_id,
70
65
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
71
 
 
72
 
 
73
66
        self.assertRaises(ValueError,
74
67
                          validate_revision_id,
75
68
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
76
 
 
77
69
        self.assertRaises(ValueError,
78
70
                          validate_revision_id,
79
71
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
80
72
 
81
73
 
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):
 
74
class MoreTests(TestCaseInTempDir):
 
75
    def test_revert(self):
 
76
        """Test selected-file revert"""
121
77
        b = Branch('.', init=True)
122
78
 
123
79
        self.build_tree(['hello.txt'])
143
99
        self.check_file_contents('hello.txt', 'initial hello')
144
100
        self.check_file_contents('hello.txt~', 'initial hello')
145
101
 
146
 
 
147
 
 
148
 
class RenameDirs(InTempDir):
149
 
    """Test renaming directories and the files within them."""
150
 
    def runTest(self):
 
102
    def test_rename_dirs(self):
 
103
        """Test renaming directories and the files within them."""
151
104
        b = Branch('.', init=True)
152
105
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
106
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
176
129
                                   ['newdir', 'newdir/newsub',
177
130
                                    'newdir/newsub/file'])
178
131
 
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):
 
132
    def test_relpath(self):
 
133
        """test for branch path lookups
 
134
    
 
135
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
136
        job: given a path (either relative to cwd or absolute), work out
 
137
        if it is inside a branch and return the path relative to the base.
 
138
        """
191
139
        from bzrlib.branch import _relpath
192
140
        import tempfile, shutil
193
141
        
238
186
        finally:
239
187
            os.chdir(savedir)
240
188
            shutil.rmtree(dtmp)
241
 
 
242
 
 
243
 
 
244
 
 
245
 
TEST_CLASSES = [Unknowns,
246
 
                ValidateRevisionId,
247
 
                PendingMerges,
248
 
                Revert,
249
 
                RenameDirs,
250
 
                BranchPathTestCase,
251
 
                ]