← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-10-17 23:32:06 UTC
  • mto: This revision was merged to the branch mainline in revision 1462.
  • Revision ID: robertc@robertcollins.net-20051017233206-cbd6059e27bd4e39
Branch.remove has been moved to WorkingTree.

Part of this is providing WorkingTree with locking primitives,
to allow the use of the needs_write_lock decorator.
(Robert Collins)

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, TestCase
 
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 TestBranch(InTempDir):
 
9
class TestBranch(TestCaseInTempDir):
12
10
 
13
11
    def test_unknowns(self):
14
 
        b = Branch('.', init=True)
 
12
        b = Branch.initialize('.')
15
13
 
16
14
        self.build_tree(['hello.txt',
17
15
                         'hello.txt~'])
22
20
    def test_no_changes(self):
23
21
        from bzrlib.errors import PointlessCommit
24
22
        
25
 
        b = Branch('.', init=True)
 
23
        b = Branch.initialize('.')
26
24
 
27
25
        self.build_tree(['hello.txt'])
28
26
 
47
45
        b.commit('commit pointless revision with one file',
48
46
                 allow_pointless=True)
49
47
 
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
 
        
 
48
 
 
49
class MoreTests(TestCaseInTempDir):
 
50
 
107
51
    def test_revert(self):
108
52
        """Test selected-file revert"""
109
 
        b = Branch('.', init=True)
 
53
        b = Branch.initialize('.')
110
54
 
111
55
        self.build_tree(['hello.txt'])
112
56
        file('hello.txt', 'w').write('initial hello')
133
77
 
134
78
    def test_rename_dirs(self):
135
79
        """Test renaming directories and the files within them."""
136
 
        b = Branch('.', init=True)
 
80
        b = Branch.initialize('.')
137
81
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
138
82
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
139
83
 
164
108
    def test_relpath(self):
165
109
        """test for branch path lookups
166
110
    
167
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
111
        bzrlib.osutils._relpath do a simple but subtle
168
112
        job: given a path (either relative to cwd or absolute), work out
169
113
        if it is inside a branch and return the path relative to the base.
170
114
        """
171
 
        from bzrlib.branch import _relpath
 
115
        from bzrlib.osutils import relpath
172
116
        import tempfile, shutil
173
117
        
174
118
        savedir = os.getcwdu()
177
121
        dtmp = os.path.realpath(dtmp)
178
122
 
179
123
        def rp(p):
180
 
            return _relpath(dtmp, p)
 
124
            return relpath(dtmp, p)
181
125
        
182
126
        try:
183
127
            # check paths inside dtmp while standing outside it
204
148
            # directory, or nearby
205
149
            os.chdir(dtmp)
206
150
 
207
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
151
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
152
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
208
153
 
209
154
            self.assertEqual(rp('foo'), 'foo')
210
155
 
218
163
        finally:
219
164
            os.chdir(savedir)
220
165
            shutil.rmtree(dtmp)
221
 
 
222
 
 
223
 
TEST_CLASSES = [TestBranch,
224
 
                TestRevisionId,
225
 
                PendingMerges
226
 
                ]