← 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: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

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
 
167
167
            'bzrlib.cmd_version_info',
168
168
            'bzrlib.externalcommand',
169
169
            'bzrlib.filters',
 
170
            'bzrlib.hashcache',
170
171
            # foreign branch plugins import the foreign_vcs_registry from 
171
172
            # bzrlib.foreign so it can't be blacklisted
172
173
            'bzrlib.gpg',
185
186
            'bzrlib.smart.server',
186
187
            'bzrlib.transform',
187
188
            'bzrlib.version_info_formats.format_rio',
 
189
            'bzrlib.xml_serializer',
 
190
            'bzrlib.xml8',
188
191
            'getpass',
189
192
            'kerberos',
 
193
            'ssl',
 
194
            'socket',
190
195
            'smtplib',
191
196
            'tarfile',
192
197
            'tempfile',
 
198
            'termios',
 
199
            'tty',
 
200
            'urllib',
193
201
            ] + old_format_modules)
194
202
        # TODO: similar test for repository-only operations, checking we avoid
195
203
        # loading wt-specific stuff
215
223
        client_medium = medium.SmartSimplePipesClientMedium(
216
224
            process.stdout, process.stdin, url)
217
225
        transport = remote.RemoteTransport(url, medium=client_medium)
218
 
        branch = BzrDir.open_from_transport(transport).open_branch()
 
226
        branch = ControlDir.open_from_transport(transport).open_branch()
219
227
        process.stdin.close()
220
228
        # Hide stdin from the subprocess module, so it won't fail to close it.
221
229
        process.stdin = None
235
243
            'bzrlib._dirstate_helpers_pyx',
236
244
            'bzrlib.externalcommand',
237
245
            'bzrlib.filters',
 
246
            'bzrlib.hashcache',
238
247
            # foreign branch plugins import the foreign_vcs_registry from 
239
248
            # bzrlib.foreign so it can't be blacklisted
240
249
            'bzrlib.gpg',
251
260
            'bzrlib.transform',
252
261
            'bzrlib.version_info_formats.format_rio',
253
262
            'bzrlib.workingtree_4',
 
263
            'bzrlib.xml_serializer',
 
264
            'bzrlib.xml8',
254
265
            'getpass',
255
266
            'kerberos',
256
267
            'smtplib',
257
268
            'tarfile',
258
269
            'tempfile',
 
270
            'termios',
 
271
            'tty',
259
272
            ] + old_format_modules)