← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lockable_files.py

Merge in the branch with the extracted lock_write token changes, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
17
17
from StringIO import StringIO
18
18
 
19
19
import bzrlib
20
 
from bzrlib.branch import Branch
21
20
import bzrlib.errors as errors
22
21
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
23
22
from bzrlib.lockable_files import LockableFiles, TransportLock
36
35
# these tests are applied in each parameterized suite for LockableFiles
37
36
class _TestLockableFiles_mixin(object):
38
37
 
39
 
    def setUp(self):
40
 
        self.reduceLockdirTimeout()
41
 
 
42
38
    def test_read_write(self):
43
39
        self.assertRaises(NoSuchFile, self.lockable.get, 'foo')
44
40
        self.assertRaises(NoSuchFile, self.lockable.get_utf8, 'foo')
320
316
 
321
317
    def setUp(self):
322
318
        TestCaseInTempDir.setUp(self)
323
 
        _TestLockableFiles_mixin.setUp(self)
324
319
        transport = get_transport('.')
325
320
        transport.mkdir('.bzr')
326
321
        self.sub_transport = transport.clone('.bzr')
343
338
 
344
339
    def setUp(self):
345
340
        TestCaseInTempDir.setUp(self)
346
 
        _TestLockableFiles_mixin.setUp(self)
347
341
        self.transport = get_transport('.')
348
342
        self.lockable = self.get_lockable()
349
343
        # the lock creation here sets mode - test_permissions on branch 
374
368
 
375
369
    def setUp(self):
376
370
        TestCaseWithSmartMedium.setUp(self)
377
 
        _TestLockableFiles_mixin.setUp(self)
378
371
        # can only get a RemoteLockDir with some RemoteObject...
379
372
        # use a branch as thats what we want. These mixin tests test the end
380
373
        # to end behaviour, so stubbing out the backend and simulating would