/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_lockable_files.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_lockable_files.py
26
26
    TestCaseInTempDir,
27
27
    TestNotApplicable,
28
28
    )
29
 
from ..bzr.tests.test_smart import TestCaseWithSmartMedium
 
29
from .test_smart import TestCaseWithSmartMedium
30
30
from .test_transactions import DummyWeave
31
31
from ..transactions import (PassThroughTransaction,
32
32
                            ReadOnlyTransaction,
119
119
            # This test does not apply, because this lockable refuses
120
120
            # tokens.
121
121
            return
122
 
        different_token = token + b'xxx'
 
122
        different_token = token + 'xxx'
123
123
        # Re-using the same lockable instance with a different token will
124
124
        # raise TokenMismatch.
125
125
        self.assertRaises(errors.TokenMismatch,
340
340
        # defeat the purpose. We test the protocol implementation separately
341
341
        # in test_remote and test_smart as usual.
342
342
        b = self.make_branch('foo')
343
 
        self.addCleanup(b.controldir.transport.disconnect)
 
343
        self.addCleanup(b.bzrdir.transport.disconnect)
344
344
        self.transport = transport.get_transport_from_path('.')
345
345
        self.lockable = self.get_lockable()
346
346
 
347
347
    def get_lockable(self):
348
348
        # getting a new lockable involves opening a new instance of the branch
349
349
        branch = breezy.branch.Branch.open(self.get_url('foo'))
350
 
        self.addCleanup(branch.controldir.transport.disconnect)
 
350
        self.addCleanup(branch.bzrdir.transport.disconnect)
351
351
        return branch.control_files