← 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

  • Committer: Robert Collins
  • Date: 2010-07-04 06:22:11 UTC
  • mto: This revision was merged to the branch mainline in revision 5332.
  • Revision ID: robertc@robertcollins.net-20100704062211-tk9hw6bnsn5x47fm
``bzrlib.lsprof.profile`` will no longer silently generate bad threaded
profiles when concurrent profile requests are made. Instead the profile
requests will be serialised. Reentrant requests will now deadlock.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
21
21
    errors,
22
22
    lockdir,
23
23
    osutils,
 
24
    transport,
24
25
    )
25
26
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
26
27
from bzrlib.lockable_files import LockableFiles, TransportLock
37
38
                                 ReadOnlyTransaction,
38
39
                                 WriteTransaction,
39
40
                                 )
40
 
from bzrlib.transport import get_transport
41
41
 
42
42
 
43
43
# these tests are applied in each parameterized suite for LockableFiles
279
279
 
280
280
    def setUp(self):
281
281
        TestCaseInTempDir.setUp(self)
282
 
        transport = get_transport('.')
283
 
        transport.mkdir('.bzr')
284
 
        self.sub_transport = transport.clone('.bzr')
 
282
        t = transport.get_transport('.')
 
283
        t.mkdir('.bzr')
 
284
        self.sub_transport = t.clone('.bzr')
285
285
        self.lockable = self.get_lockable()
286
286
        self.lockable.create_lock()
287
287
 
304
304
 
305
305
    def setUp(self):
306
306
        TestCaseInTempDir.setUp(self)
307
 
        self.transport = get_transport('.')
 
307
        self.transport = transport.get_transport('.')
308
308
        self.lockable = self.get_lockable()
309
309
        # the lock creation here sets mode - test_permissions on branch
310
310
        # tests that implicitly, but it might be a good idea to factor
347
347
        # in test_remote and test_smart as usual.
348
348
        b = self.make_branch('foo')
349
349
        self.addCleanup(b.bzrdir.transport.disconnect)
350
 
        self.transport = get_transport('.')
 
350
        self.transport = transport.get_transport('.')
351
351
        self.lockable = self.get_lockable()
352
352
 
353
353
    def get_lockable(self):