← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testbranch.py

  • Committer: Robert Collins
  • Date: 2005-10-17 23:35:18 UTC
  • mfrom: (1442.1.65)
  • Revision ID: robertc@robertcollins.net-20051017233518-6746654be564edde
Merge in more GPG work, and more Branch-api-shrinkage.

* Branch.remove has been moved to WorkingTree, which has also gained
  lock_read, lock_write and unlock methods for convenience. (Robert
  Collins)

* Two decorators, needs_read_lock and needs_write_lock have been added
  to the branch module. Use these to cause a function to run in a
  read or write lock respectively. (Robert Collins)

* Branch.open_containing now returns a tuple (Branch, relative-path),
  which allows direct access to the common case of 'get me this file
  from its branch'. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testbranch.py
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
 
from bzrlib.branch import Branch
 
18
 
 
19
from bzrlib.branch import Branch, needs_read_lock, needs_write_lock
19
20
from bzrlib.clone import copy_branch
20
21
from bzrlib.commit import commit
21
22
import bzrlib.errors as errors
22
23
from bzrlib.errors import NoSuchRevision, UnlistableBranch, NotBranchError
23
 
from bzrlib.selftest import TestCaseInTempDir
 
24
import bzrlib.gpg
 
25
from bzrlib.selftest import TestCase, TestCaseInTempDir
 
26
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
24
27
from bzrlib.trace import mutter
25
28
import bzrlib.transactions as transactions
26
 
from bzrlib.selftest.HTTPTestUtil import TestCaseWithWebserver
27
29
 
28
30
# TODO: Make a branch using basis branch, and check that it 
29
31
# doesn't request any files that could have been avoided, by 
143
145
        self.assertEquals(b.pending_merges(), [])
144
146
 
145
147
    def test_sign_existing_revision(self):
146
 
        import bzrlib.gpg
147
148
        branch = Branch.initialize('.')
148
149
        branch.commit("base", allow_pointless=True, rev_id='A')
149
150
        from bzrlib.testament import Testament
151
152
        self.assertEqual(Testament.from_revision(branch, 'A').as_short_text(),
152
153
                         branch.revision_store.get('A', 'sig').read())
153
154
 
 
155
    def test_store_signature(self):
 
156
        branch = Branch.initialize('.')
 
157
        branch.store_revision_signature(bzrlib.gpg.LoopbackGPGStrategy(None),
 
158
                                        'FOO', 'A')
 
159
        self.assertEqual('FOO', branch.revision_store.get('A', 'sig').read())
 
160
 
154
161
 
155
162
class TestRemote(TestCaseWithWebserver):
156
163
 
160
167
        self.assertRaises(NotBranchError, Branch.open_containing,
161
168
                          self.get_remote_url('g/p/q'))
162
169
        b = Branch.initialize('.')
163
 
        Branch.open_containing(self.get_remote_url(''))
164
 
        Branch.open_containing(self.get_remote_url('g/p/q'))
 
170
        branch, relpath = Branch.open_containing(self.get_remote_url(''))
 
171
        self.assertEqual('', relpath)
 
172
        branch, relpath = Branch.open_containing(self.get_remote_url('g/p/q'))
 
173
        self.assertEqual('g/p/q', relpath)
165
174
        
166
175
# TODO: rewrite this as a regular unittest, without relying on the displayed output        
167
176
#         >>> from bzrlib.commit import commit
191
200
        self.calls = []
192
201
 
193
202
 
 
203
class TestDecorator(object):
 
204
 
 
205
    def __init__(self):
 
206
        self._calls = []
 
207
 
 
208
    def lock_read(self):
 
209
        self._calls.append('lr')
 
210
 
 
211
    def lock_write(self):
 
212
        self._calls.append('lw')
 
213
 
 
214
    def unlock(self):
 
215
        self._calls.append('ul')
 
216
 
 
217
    @needs_read_lock
 
218
    def do_with_read(self):
 
219
        return 1
 
220
 
 
221
    @needs_read_lock
 
222
    def except_with_read(self):
 
223
        raise RuntimeError
 
224
 
 
225
    @needs_write_lock
 
226
    def do_with_write(self):
 
227
        return 2
 
228
 
 
229
    @needs_write_lock
 
230
    def except_with_write(self):
 
231
        raise RuntimeError
 
232
 
 
233
 
 
234
class TestDecorators(TestCase):
 
235
 
 
236
    def test_needs_read_lock(self):
 
237
        branch = TestDecorator()
 
238
        self.assertEqual(1, branch.do_with_read())
 
239
        self.assertEqual(['lr', 'ul'], branch._calls)
 
240
 
 
241
    def test_excepts_in_read_lock(self):
 
242
        branch = TestDecorator()
 
243
        self.assertRaises(RuntimeError, branch.except_with_read)
 
244
        self.assertEqual(['lr', 'ul'], branch._calls)
 
245
 
 
246
    def test_needs_write_lock(self):
 
247
        branch = TestDecorator()
 
248
        self.assertEqual(2, branch.do_with_write())
 
249
        self.assertEqual(['lw', 'ul'], branch._calls)
 
250
 
 
251
    def test_excepts_in_write_lock(self):
 
252
        branch = TestDecorator()
 
253
        self.assertRaises(RuntimeError, branch.except_with_write)
 
254
        self.assertEqual(['lw', 'ul'], branch._calls)
 
255
 
 
256
 
194
257
class TestBranchTransaction(TestCaseInTempDir):
195
258
 
196
259
    def setUp(self):