← 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-11 03:40:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050711034002-575d84b4c7514542
- commit command refuses unless something is changed or --unchanged is given

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
 
 
52
        b.add_pending_merge('mbp@892739123-2005-123123')
 
53
        b.commit('commit new merge with no text changes',
 
54
                 allow_pointless=False)
48
55
        
49
56
 
50
57
 
51
 
class TestRevisionId(TestCase):
52
 
    
53
 
    def test_validate_revision_id(self):
 
58
class ValidateRevisionId(TestBase):
 
59
    def runTest(self):
54
60
        from bzrlib.revision import validate_revision_id
55
61
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
62
        
56
63
        self.assertRaises(ValueError,
57
64
                          validate_revision_id,
58
65
                          ' asdkjas')
 
66
 
 
67
 
59
68
        self.assertRaises(ValueError,
60
69
                          validate_revision_id,
61
70
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
71
 
 
72
 
62
73
        self.assertRaises(ValueError,
63
74
                          validate_revision_id,
64
75
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
76
 
65
77
        self.assertRaises(ValueError,
66
78
                          validate_revision_id,
67
79
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
68
80
 
69
81
 
70
 
class MoreTests(TestCaseInTempDir):
71
 
 
72
 
    def test_revert(self):
73
 
        """Test selected-file revert"""
74
 
        b = Branch.initialize('.')
 
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)
75
122
 
76
123
        self.build_tree(['hello.txt'])
77
124
        file('hello.txt', 'w').write('initial hello')
96
143
        self.check_file_contents('hello.txt', 'initial hello')
97
144
        self.check_file_contents('hello.txt~', 'initial hello')
98
145
 
99
 
    def test_rename_dirs(self):
100
 
        """Test renaming directories and the files within them."""
101
 
        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)
102
152
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
153
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
154
 
126
176
                                   ['newdir', 'newdir/newsub',
127
177
                                    'newdir/newsub/file'])
128
178
 
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
 
        """
 
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):
136
191
        from bzrlib.branch import _relpath
137
192
        import tempfile, shutil
138
193
        
139
194
        savedir = os.getcwdu()
140
195
        dtmp = tempfile.mkdtemp()
141
 
        # On Mac OSX, /tmp actually expands to /private/tmp
142
 
        dtmp = os.path.realpath(dtmp)
143
196
 
144
197
        def rp(p):
145
198
            return _relpath(dtmp, p)
169
222
            # directory, or nearby
170
223
            os.chdir(dtmp)
171
224
 
172
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
173
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
225
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
174
226
 
175
227
            self.assertEqual(rp('foo'), 'foo')
176
228
 
184
236
        finally:
185
237
            os.chdir(savedir)
186
238
            shutil.rmtree(dtmp)
 
239
 
 
240
 
 
241
 
 
242
 
 
243
TEST_CLASSES = [Unknowns,
 
244
                ValidateRevisionId,
 
245
                PendingMerges,
 
246
                Revert,
 
247
                RenameDirs,
 
248
                BranchPathTestCase,
 
249
                ]