← 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

Merge bzr.dev into cleanup resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_import_tariff.py
55
55
        # explicitly do want to test against things installed there, therefore
56
56
        # we pass it through.
57
57
        env_changes = dict(PYTHONVERBOSE='1')
58
 
        for name in ['BZR_HOME', 'BZR_PLUGIN_PATH', 'HOME',]:
 
58
        for name in ['BZR_HOME', 'BZR_PLUGIN_PATH',
 
59
                     'BZR_DISABLE_PLUGINS', 'BZR_PLUGINS_AT',
 
60
                     'HOME',]:
59
61
            env_changes[name] = self._old_env.get(name)
60
62
        out, err = self.run_bzr_subprocess(args,
61
63
            allow_plugins=(not are_plugins_disabled()),
62
64
            env_changes=env_changes)
63
65
 
64
 
        self.addDetail('subprocess_stderr', 
 
66
        self.addDetail('subprocess_stderr',
65
67
            content.Content(content.ContentType("text", "plain"),
66
68
                lambda:[err]))
67
69
 
71
73
                bad_modules.append(module_name)
72
74
 
73
75
        if bad_modules:
74
 
            self.fail("command %r loaded forbidden modules %r" 
 
76
            self.fail("command %r loaded forbidden modules %r"
75
77
                % (args, bad_modules))
76
78
        return out, err
77
79
 
93
95
            'bzrlib.bundle.commands',
94
96
            'bzrlib.cmd_version_info',
95
97
            'bzrlib.foreign',
 
98
            'bzrlib.merge3',
 
99
            'bzrlib.patiencediff',
96
100
            'bzrlib.remote',
97
101
            'bzrlib.sign_my_commits',
98
102
            'bzrlib.smart',
 
103
            'bzrlib.transform',
 
104
            'kerberos',
99
105
            'smtplib',
100
106
            'tarfile',
101
107
            ])
102
108
        # TODO: similar test for repository-only operations, checking we avoid
103
109
        # loading wt-specific stuff
104
110
        #
105
 
        # See https://bugs.edge.launchpad.net/bzr/+bug/553017
 
111
        # See https://bugs.launchpad.net/bzr/+bug/553017