← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-08-23 10:44:48 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050823104448-fb5d448e7a5a8ee3
relace runTest with test_foo in blackbox tests

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, TestCase
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
 
51
55
        
52
56
 
53
57
 
54
 
class TestRevisionId(TestCase):
55
 
    
56
 
    def test_validate_revision_id(self):
 
58
class ValidateRevisionId(TestCase):
 
59
    def runTest(self):
57
60
        from bzrlib.revision import validate_revision_id
58
61
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
62
        
59
63
        self.assertRaises(ValueError,
60
64
                          validate_revision_id,
61
65
                          ' asdkjas')
 
66
 
 
67
 
62
68
        self.assertRaises(ValueError,
63
69
                          validate_revision_id,
64
70
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
71
 
 
72
 
65
73
        self.assertRaises(ValueError,
66
74
                          validate_revision_id,
67
75
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
76
 
68
77
        self.assertRaises(ValueError,
69
78
                          validate_revision_id,
70
79
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
71
80
 
72
81
 
73
 
class PendingMerges(TestCaseInTempDir):
74
82
 
75
 
    def test_pending_merges(self):
76
 
        """Tracking pending-merged revisions."""
77
 
        b = Branch.initialize('.')
 
83
class PendingMerges(InTempDir):
 
84
    """Tracking pending-merged revisions."""
 
85
    def runTest(self):
 
86
        b = Branch('.', init=True)
78
87
 
79
88
        self.assertEquals(b.pending_merges(), [])
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'])
 
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
 
84
98
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
85
99
        self.assertEquals(b.pending_merges(),
86
100
                          ['foo@azkhazan-123123-abcabc',
87
101
                           'wibble@fofof--20050401--1928390812'])
 
102
 
88
103
        b.commit("commit from base with two merges")
 
104
 
89
105
        rev = b.get_revision(b.revision_history()[0])
90
106
        self.assertEquals(len(rev.parents), 2)
91
107
        self.assertEquals(rev.parents[0].revision_id,
92
108
                          'foo@azkhazan-123123-abcabc')
93
109
        self.assertEquals(rev.parents[1].revision_id,
94
110
                           'wibble@fofof--20050401--1928390812')
 
111
 
95
112
        # list should be cleared when we do a commit
96
113
        self.assertEquals(b.pending_merges(), [])
97
114
        
98
 
    def test_revert(self):
99
 
        """Test selected-file revert"""
100
 
        b = Branch.initialize('.')
 
115
        
 
116
        
 
117
 
 
118
class Revert(InTempDir):
 
119
    """Test selected-file revert"""
 
120
    def runTest(self):
 
121
        b = Branch('.', init=True)
101
122
 
102
123
        self.build_tree(['hello.txt'])
103
124
        file('hello.txt', 'w').write('initial hello')
122
143
        self.check_file_contents('hello.txt', 'initial hello')
123
144
        self.check_file_contents('hello.txt~', 'initial hello')
124
145
 
125
 
    def test_rename_dirs(self):
126
 
        """Test renaming directories and the files within them."""
127
 
        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)
128
152
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
153
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
130
154
 
152
176
                                   ['newdir', 'newdir/newsub',
153
177
                                    'newdir/newsub/file'])
154
178
 
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
 
        """
 
179
        
 
180
 
 
181
 
 
182
class BranchPathTestCase(TestCase):
 
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):
162
191
        from bzrlib.branch import _relpath
163
192
        import tempfile, shutil
164
193
        
209
238
        finally:
210
239
            os.chdir(savedir)
211
240
            shutil.rmtree(dtmp)
 
241
 
 
242
 
 
243
 
 
244
 
 
245
TEST_CLASSES = [Unknowns,
 
246
                ValidateRevisionId,
 
247
                PendingMerges,
 
248
                Revert,
 
249
                RenameDirs,
 
250
                BranchPathTestCase,
 
251
                ]