← 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-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:
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
 
        from bzrlib.errors import PointlessCommit
22
 
        
23
 
        b = Branch.initialize('.')
24
 
 
25
 
        self.build_tree(['hello.txt'])
26
 
 
27
 
        self.assertRaises(PointlessCommit,
28
 
                          b.commit,
29
 
                          'commit without adding',
30
 
                          allow_pointless=False)
31
 
 
32
 
        b.commit('commit pointless tree',
33
 
                 allow_pointless=True)
34
 
 
35
 
        b.add('hello.txt')
36
 
        
37
 
        b.commit('commit first added file',
38
 
                 allow_pointless=False)
39
 
        
40
 
        self.assertRaises(PointlessCommit,
41
 
                          b.commit,
42
 
                          'commit after adding file',
43
 
                          allow_pointless=False)
44
 
        
45
 
        b.commit('commit pointless revision with one file',
46
 
                 allow_pointless=True)
47
 
 
48
 
        
49
 
 
50
 
 
51
 
class TestRevisionId(TestCase):
52
 
    
53
 
    def test_validate_revision_id(self):
 
21
 
 
22
 
 
23
class ValidateRevisionId(TestBase):
 
24
    def runTest(self):
54
25
        from bzrlib.revision import validate_revision_id
55
26
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
27
        
56
28
        self.assertRaises(ValueError,
57
29
                          validate_revision_id,
58
30
                          ' asdkjas')
 
31
 
 
32
 
59
33
        self.assertRaises(ValueError,
60
34
                          validate_revision_id,
61
35
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
36
 
 
37
 
62
38
        self.assertRaises(ValueError,
63
39
                          validate_revision_id,
64
40
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
41
 
65
42
        self.assertRaises(ValueError,
66
43
                          validate_revision_id,
67
44
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
68
45
 
69
46
 
70
 
class MoreTests(TestCaseInTempDir):
71
 
 
72
 
    def test_revert(self):
73
 
        """Test selected-file revert"""
74
 
        b = Branch.initialize('.')
 
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)
75
87
 
76
88
        self.build_tree(['hello.txt'])
77
89
        file('hello.txt', 'w').write('initial hello')
96
108
        self.check_file_contents('hello.txt', 'initial hello')
97
109
        self.check_file_contents('hello.txt~', 'initial hello')
98
110
 
99
 
    def test_rename_dirs(self):
100
 
        """Test renaming directories and the files within them."""
101
 
        b = Branch.initialize('.')
 
111
 
 
112
 
 
113
class RenameDirs(InTempDir):
 
114
    """Test renaming directories and the files within them."""
 
115
    def runTest(self):
 
116
        b = Branch('.', init=True)
102
117
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
118
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
119
 
126
141
                                   ['newdir', 'newdir/newsub',
127
142
                                    'newdir/newsub/file'])
128
143
 
129
 
    def test_relpath(self):
130
 
        """test for branch path lookups
131
 
    
132
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
133
 
        job: given a path (either relative to cwd or absolute), work out
134
 
        if it is inside a branch and return the path relative to the base.
135
 
        """
 
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):
136
156
        from bzrlib.branch import _relpath
137
157
        import tempfile, shutil
138
158
        
139
159
        savedir = os.getcwdu()
140
160
        dtmp = tempfile.mkdtemp()
141
 
        # On Mac OSX, /tmp actually expands to /private/tmp
142
 
        dtmp = os.path.realpath(dtmp)
143
161
 
144
162
        def rp(p):
145
163
            return _relpath(dtmp, p)
169
187
            # directory, or nearby
170
188
            os.chdir(dtmp)
171
189
 
172
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
173
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
190
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
174
191
 
175
192
            self.assertEqual(rp('foo'), 'foo')
176
193
 
184
201
        finally:
185
202
            os.chdir(savedir)
186
203
            shutil.rmtree(dtmp)
 
204
 
 
205
 
 
206
 
 
207
 
 
208
TEST_CLASSES = [Unknowns,
 
209
                ValidateRevisionId,
 
210
                PendingMerges,
 
211
                Revert,
 
212
                RenameDirs,
 
213
                BranchPathTestCase,
 
214
                ]