← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-19 02:52:24 UTC
  • mto: (1185.1.29)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: aaron.bentley@utoronto.ca-20050919025224-1cc3c70640086e09
TODO re tests

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 ValidateRevisionId(TestBase):
24
 
    def runTest(self):
 
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
        b.add_pending_merge('mbp@892739123-2005-123123')
 
49
        b.commit('commit new merge with no text changes',
 
50
                 allow_pointless=False)
 
51
        
 
52
 
 
53
 
 
54
class TestRevisionId(TestCase):
 
55
    
 
56
    def test_validate_revision_id(self):
25
57
        from bzrlib.revision import validate_revision_id
26
58
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
27
 
        
28
59
        self.assertRaises(ValueError,
29
60
                          validate_revision_id,
30
61
                          ' asdkjas')
31
 
 
32
 
 
33
62
        self.assertRaises(ValueError,
34
63
                          validate_revision_id,
35
64
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
36
 
 
37
 
 
38
65
        self.assertRaises(ValueError,
39
66
                          validate_revision_id,
40
67
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
41
 
 
42
68
        self.assertRaises(ValueError,
43
69
                          validate_revision_id,
44
70
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
45
71
 
46
72
 
 
73
class PendingMerges(TestCaseInTempDir):
47
74
 
48
 
class PendingMerges(InTempDir):
49
 
    """Tracking pending-merged revisions."""
50
 
    def runTest(self):
51
 
        b = Branch('.', init=True)
 
75
    def test_pending_merges(self):
 
76
        """Tracking pending-merged revisions."""
 
77
        b = Branch.initialize('.')
52
78
 
53
79
        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
 
 
 
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'])
63
84
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
64
85
        self.assertEquals(b.pending_merges(),
65
86
                          ['foo@azkhazan-123123-abcabc',
66
87
                           'wibble@fofof--20050401--1928390812'])
67
 
 
68
88
        b.commit("commit from base with two merges")
69
 
 
70
89
        rev = b.get_revision(b.revision_history()[0])
71
90
        self.assertEquals(len(rev.parents), 2)
72
91
        self.assertEquals(rev.parents[0].revision_id,
73
92
                          'foo@azkhazan-123123-abcabc')
74
93
        self.assertEquals(rev.parents[1].revision_id,
75
94
                           'wibble@fofof--20050401--1928390812')
76
 
 
77
95
        # list should be cleared when we do a commit
78
96
        self.assertEquals(b.pending_merges(), [])
79
97
        
80
 
        
81
 
        
82
 
 
83
 
class Revert(InTempDir):
84
 
    """Test selected-file revert"""
85
 
    def runTest(self):
86
 
        b = Branch('.', init=True)
 
98
    def test_revert(self):
 
99
        """Test selected-file revert"""
 
100
        b = Branch.initialize('.')
87
101
 
88
102
        self.build_tree(['hello.txt'])
89
103
        file('hello.txt', 'w').write('initial hello')
108
122
        self.check_file_contents('hello.txt', 'initial hello')
109
123
        self.check_file_contents('hello.txt~', 'initial hello')
110
124
 
111
 
 
112
 
 
113
 
class RenameDirs(InTempDir):
114
 
    """Test renaming directories and the files within them."""
115
 
    def runTest(self):
116
 
        b = Branch('.', init=True)
 
125
    def test_rename_dirs(self):
 
126
        """Test renaming directories and the files within them."""
 
127
        b = Branch.initialize('.')
117
128
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
118
129
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
119
130
 
141
152
                                   ['newdir', 'newdir/newsub',
142
153
                                    'newdir/newsub/file'])
143
154
 
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):
 
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
        """
156
162
        from bzrlib.branch import _relpath
157
163
        import tempfile, shutil
158
164
        
159
165
        savedir = os.getcwdu()
160
166
        dtmp = tempfile.mkdtemp()
 
167
        # On Mac OSX, /tmp actually expands to /private/tmp
 
168
        dtmp = os.path.realpath(dtmp)
161
169
 
162
170
        def rp(p):
163
171
            return _relpath(dtmp, p)
201
209
        finally:
202
210
            os.chdir(savedir)
203
211
            shutil.rmtree(dtmp)
204
 
 
205
 
 
206
 
 
207
 
 
208
 
TEST_CLASSES = [Unknowns,
209
 
                ValidateRevisionId,
210
 
                PendingMerges,
211
 
                Revert,
212
 
                RenameDirs,
213
 
                BranchPathTestCase,
214
 
                ]