← 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: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lockable_files.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from StringIO import StringIO
18
 
 
19
17
import bzrlib
20
18
from bzrlib import (
21
19
    errors,
23
21
    osutils,
24
22
    transport,
25
23
    )
26
 
from bzrlib.errors import BzrBadParameterNotString, NoSuchFile, ReadOnlyError
27
24
from bzrlib.lockable_files import LockableFiles, TransportLock
28
 
from bzrlib.symbol_versioning import (
29
 
    deprecated_in,
30
 
    )
31
25
from bzrlib.tests import (
32
26
    TestCaseInTempDir,
33
27
    TestNotApplicable,
278
272
                                      _TestLockableFiles_mixin):
279
273
 
280
274
    def setUp(self):
281
 
        TestCaseInTempDir.setUp(self)
282
 
        t = transport.get_transport('.')
 
275
        super(TestLockableFiles_TransportLock, self).setUp()
 
276
        t = transport.get_transport_from_path('.')
283
277
        t.mkdir('.bzr')
284
278
        self.sub_transport = t.clone('.bzr')
285
279
        self.lockable = self.get_lockable()
299
293
 
300
294
 
301
295
class TestLockableFiles_LockDir(TestCaseInTempDir,
302
 
                              _TestLockableFiles_mixin):
 
296
                                _TestLockableFiles_mixin):
303
297
    """LockableFile tests run with LockDir underneath"""
304
298
 
305
299
    def setUp(self):
306
 
        TestCaseInTempDir.setUp(self)
307
 
        self.transport = transport.get_transport('.')
 
300
        super(TestLockableFiles_LockDir, self).setUp()
 
301
        self.transport = transport.get_transport_from_path('.')
308
302
        self.lockable = self.get_lockable()
309
303
        # the lock creation here sets mode - test_permissions on branch
310
304
        # tests that implicitly, but it might be a good idea to factor
335
329
 
336
330
 
337
331
class TestLockableFiles_RemoteLockDir(TestCaseWithSmartMedium,
338
 
                              _TestLockableFiles_mixin):
 
332
                                      _TestLockableFiles_mixin):
339
333
    """LockableFile tests run with RemoteLockDir on a branch."""
340
334
 
341
335
    def setUp(self):
342
 
        TestCaseWithSmartMedium.setUp(self)
 
336
        super(TestLockableFiles_RemoteLockDir, self).setUp()
343
337
        # can only get a RemoteLockDir with some RemoteObject...
344
338
        # use a branch as thats what we want. These mixin tests test the end
345
339
        # to end behaviour, so stubbing out the backend and simulating would
347
341
        # in test_remote and test_smart as usual.
348
342
        b = self.make_branch('foo')
349
343
        self.addCleanup(b.bzrdir.transport.disconnect)
350
 
        self.transport = transport.get_transport('.')
 
344
        self.transport = transport.get_transport_from_path('.')
351
345
        self.lockable = self.get_lockable()
352
346
 
353
347
    def get_lockable(self):