← 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: 2013-05-25 17:12:43 UTC
  • mto: (6437.77.1 2.5)
  • mto: This revision was merged to the branch mainline in revision 6577.
  • Revision ID: v.ladeuil+lp@free.fr-20130525171243-au0073fnspecl3kg
https://launchpad.net/bugs/1089792
Empty arguments in EDITOR are now properly preserved

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,
279
273
 
280
274
    def setUp(self):
281
275
        TestCaseInTempDir.setUp(self)
282
 
        t = transport.get_transport('.')
 
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()
304
298
 
305
299
    def setUp(self):
306
300
        TestCaseInTempDir.setUp(self)
307
 
        self.transport = transport.get_transport('.')
 
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
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):