← 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-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

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):
 
11
class TestBranch(InTempDir):
10
12
 
11
13
    def test_unknowns(self):
12
 
        b = Branch.initialize('.')
 
14
        b = Branch('.', init=True)
13
15
 
14
16
        self.build_tree(['hello.txt',
15
17
                         'hello.txt~'])
20
22
    def test_no_changes(self):
21
23
        from bzrlib.errors import PointlessCommit
22
24
        
23
 
        b = Branch.initialize('.')
 
25
        b = Branch('.', init=True)
24
26
 
25
27
        self.build_tree(['hello.txt'])
26
28
 
45
47
        b.commit('commit pointless revision with one file',
46
48
                 allow_pointless=True)
47
49
 
48
 
 
49
 
class MoreTests(TestCaseInTempDir):
50
 
 
 
50
        b.add_pending_merge('mbp@892739123-2005-123123')
 
51
        b.commit('commit new merge with no text changes',
 
52
                 allow_pointless=False)
 
53
        
 
54
 
 
55
 
 
56
class TestRevisionId(TestCase):
 
57
    
 
58
    def test_validate_revision_id(self):
 
59
        from bzrlib.revision import validate_revision_id
 
60
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
61
        self.assertRaises(ValueError,
 
62
                          validate_revision_id,
 
63
                          ' asdkjas')
 
64
        self.assertRaises(ValueError,
 
65
                          validate_revision_id,
 
66
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
67
        self.assertRaises(ValueError,
 
68
                          validate_revision_id,
 
69
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
70
        self.assertRaises(ValueError,
 
71
                          validate_revision_id,
 
72
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
73
 
 
74
 
 
75
class PendingMerges(InTempDir):
 
76
    def test_pending_merges(self):
 
77
        """Tracking pending-merged revisions."""
 
78
        b = Branch('.', init=True)
 
79
 
 
80
        self.assertEquals(b.pending_merges(), [])
 
81
        
 
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
83
        
 
84
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
85
    
 
86
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
87
        
 
88
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
89
 
 
90
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
91
        self.assertEquals(b.pending_merges(),
 
92
                          ['foo@azkhazan-123123-abcabc',
 
93
                           'wibble@fofof--20050401--1928390812'])
 
94
 
 
95
        b.commit("commit from base with two merges")
 
96
 
 
97
        rev = b.get_revision(b.revision_history()[0])
 
98
        self.assertEquals(len(rev.parents), 2)
 
99
        self.assertEquals(rev.parents[0].revision_id,
 
100
                          'foo@azkhazan-123123-abcabc')
 
101
        self.assertEquals(rev.parents[1].revision_id,
 
102
                           'wibble@fofof--20050401--1928390812')
 
103
 
 
104
        # list should be cleared when we do a commit
 
105
        self.assertEquals(b.pending_merges(), [])
 
106
        
51
107
    def test_revert(self):
52
108
        """Test selected-file revert"""
53
 
        b = Branch.initialize('.')
 
109
        b = Branch('.', init=True)
54
110
 
55
111
        self.build_tree(['hello.txt'])
56
112
        file('hello.txt', 'w').write('initial hello')
77
133
 
78
134
    def test_rename_dirs(self):
79
135
        """Test renaming directories and the files within them."""
80
 
        b = Branch.initialize('.')
 
136
        b = Branch('.', init=True)
81
137
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
82
138
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
83
139
 
108
164
    def test_relpath(self):
109
165
        """test for branch path lookups
110
166
    
111
 
        bzrlib.osutils._relpath do a simple but subtle
 
167
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
112
168
        job: given a path (either relative to cwd or absolute), work out
113
169
        if it is inside a branch and return the path relative to the base.
114
170
        """
115
 
        from bzrlib.osutils import relpath
 
171
        from bzrlib.branch import _relpath
116
172
        import tempfile, shutil
117
173
        
118
174
        savedir = os.getcwdu()
121
177
        dtmp = os.path.realpath(dtmp)
122
178
 
123
179
        def rp(p):
124
 
            return relpath(dtmp, p)
 
180
            return _relpath(dtmp, p)
125
181
        
126
182
        try:
127
183
            # check paths inside dtmp while standing outside it
148
204
            # directory, or nearby
149
205
            os.chdir(dtmp)
150
206
 
151
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
152
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
207
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
153
208
 
154
209
            self.assertEqual(rp('foo'), 'foo')
155
210
 
163
218
        finally:
164
219
            os.chdir(savedir)
165
220
            shutil.rmtree(dtmp)
 
221
 
 
222
 
 
223
TEST_CLASSES = [TestBranch,
 
224
                TestRevisionId,
 
225
                PendingMerges
 
226
                ]