← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_import_tariff.py

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_import_tariff.py
25
25
    plugins as _mod_plugins,
26
26
    trace,
27
27
    )
28
 
from bzrlib.bzrdir import BzrDir
 
28
from bzrlib.controldir import ControlDir
29
29
from bzrlib.smart import medium
30
30
from bzrlib.transport import remote
31
31
 
186
186
            'bzrlib.smart.server',
187
187
            'bzrlib.transform',
188
188
            'bzrlib.version_info_formats.format_rio',
 
189
            'bzrlib.xml_serializer',
 
190
            'bzrlib.xml8',
189
191
            'getpass',
190
192
            'kerberos',
 
193
            'ssl',
 
194
            'socket',
191
195
            'smtplib',
192
196
            'tarfile',
193
197
            'tempfile',
 
198
            'termios',
 
199
            'tty',
 
200
            'urllib',
194
201
            ] + old_format_modules)
195
202
        # TODO: similar test for repository-only operations, checking we avoid
196
203
        # loading wt-specific stuff
216
223
        client_medium = medium.SmartSimplePipesClientMedium(
217
224
            process.stdout, process.stdin, url)
218
225
        transport = remote.RemoteTransport(url, medium=client_medium)
219
 
        branch = BzrDir.open_from_transport(transport).open_branch()
 
226
        branch = ControlDir.open_from_transport(transport).open_branch()
220
227
        process.stdin.close()
221
228
        # Hide stdin from the subprocess module, so it won't fail to close it.
222
229
        process.stdin = None
253
260
            'bzrlib.transform',
254
261
            'bzrlib.version_info_formats.format_rio',
255
262
            'bzrlib.workingtree_4',
 
263
            'bzrlib.xml_serializer',
 
264
            'bzrlib.xml8',
256
265
            'getpass',
257
266
            'kerberos',
258
267
            'smtplib',
259
268
            'tarfile',
260
269
            'tempfile',
 
270
            'termios',
 
271
            'tty',
261
272
            ] + old_format_modules)