/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-29 12:49:59 UTC
  • mto: (1185.14.2)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: mbp@sourcefrog.net-20050929124959-df3f175844fc90ed
- remove redundant import

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
 
49
45
        b.commit('commit pointless revision with one file',
50
46
                 allow_pointless=True)
51
47
 
52
 
        b.add_pending_merge('mbp@892739123-2005-123123')
53
 
        b.commit('commit new merge with no text changes',
54
 
                 allow_pointless=False)
55
48
        
56
49
 
57
50
 
58
 
class ValidateRevisionId(TestBase):
59
 
    def runTest(self):
 
51
class TestRevisionId(TestCase):
 
52
    
 
53
    def test_validate_revision_id(self):
60
54
        from bzrlib.revision import validate_revision_id
61
55
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
62
 
        
63
56
        self.assertRaises(ValueError,
64
57
                          validate_revision_id,
65
58
                          ' asdkjas')
66
 
 
67
 
 
68
59
        self.assertRaises(ValueError,
69
60
                          validate_revision_id,
70
61
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
71
 
 
72
 
 
73
62
        self.assertRaises(ValueError,
74
63
                          validate_revision_id,
75
64
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
76
 
 
77
65
        self.assertRaises(ValueError,
78
66
                          validate_revision_id,
79
67
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
80
68
 
81
69
 
82
 
 
83
 
class PendingMerges(InTempDir):
84
 
    """Tracking pending-merged revisions."""
85
 
    def runTest(self):
86
 
        b = Branch('.', init=True)
 
70
class PendingMerges(TestCaseInTempDir):
 
71
 
 
72
    def test_pending_merges(self):
 
73
        """Tracking pending-merged revisions."""
 
74
        print "GHOST SUPPORT REMOVED"
 
75
        return
 
76
 
 
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
 
        
115
 
        
116
 
        
117
 
 
118
 
class Revert(InTempDir):
119
 
    """Test selected-file revert"""
120
 
    def runTest(self):
121
 
        b = Branch('.', init=True)
 
97
 
 
98
 
 
99
class MoreTests(TestCaseInTempDir):
 
100
 
 
101
    def test_revert(self):
 
102
        """Test selected-file revert"""
 
103
        b = Branch.initialize('.')
122
104
 
123
105
        self.build_tree(['hello.txt'])
124
106
        file('hello.txt', 'w').write('initial hello')
143
125
        self.check_file_contents('hello.txt', 'initial hello')
144
126
        self.check_file_contents('hello.txt~', 'initial hello')
145
127
 
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
    def test_rename_dirs(self):
 
129
        """Test renaming directories and the files within them."""
 
130
        b = Branch.initialize('.')
152
131
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
153
132
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
154
133
 
176
155
                                   ['newdir', 'newdir/newsub',
177
156
                                    'newdir/newsub/file'])
178
157
 
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):
 
158
    def test_relpath(self):
 
159
        """test for branch path lookups
 
160
    
 
161
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
162
        job: given a path (either relative to cwd or absolute), work out
 
163
        if it is inside a branch and return the path relative to the base.
 
164
        """
191
165
        from bzrlib.branch import _relpath
192
166
        import tempfile, shutil
193
167
        
224
198
            # directory, or nearby
225
199
            os.chdir(dtmp)
226
200
 
227
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
201
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
202
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
228
203
 
229
204
            self.assertEqual(rp('foo'), 'foo')
230
205
 
238
213
        finally:
239
214
            os.chdir(savedir)
240
215
            shutil.rmtree(dtmp)
241
 
 
242
 
 
243
 
 
244
 
 
245
 
TEST_CLASSES = [Unknowns,
246
 
                ValidateRevisionId,
247
 
                PendingMerges,
248
 
                Revert,
249
 
                RenameDirs,
250
 
                BranchPathTestCase,
251
 
                ]