/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_import_tariff.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-05 22:01:28 UTC
  • mfrom: (6658 work)
  • mto: This revision was merged to the branch mainline in revision 6666.
  • Revision ID: jelmer@jelmer.uk-20170605220128-xurjonb8cjf5o52j
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_import_tariff.py
29
29
from ..smart import medium
30
30
from ..transport import remote
31
31
 
32
 
from ..plugin import (
33
 
    are_plugins_disabled,
34
 
    )
35
 
 
36
32
from . import (
37
33
    TestCaseWithTransport,
38
34
    )
88
84
        # bzr is frozen and python is not explicitly specified. -- mbp 20100208
89
85
        env_changes = dict(PYTHONVERBOSE='1', **self.preserved_env_vars)
90
86
        trace.mutter('Setting env for bzr subprocess: %r', env_changes)
91
 
        kwargs = dict(env_changes=env_changes,
92
 
                      allow_plugins=(not are_plugins_disabled()))
 
87
        kwargs = dict(env_changes=env_changes, allow_plugins=False)
93
88
        if stderr_file:
94
89
            # We don't want to update the whole call chain so we insert stderr
95
90
            # *iff* we need to