/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: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_import_tariff.py
27
27
    )
28
28
from ..controldir import ControlDir
29
29
from ..bzr.smart import medium
 
30
from ..sixish import PY3
30
31
from ..transport import remote
31
32
 
32
33
from . import (
97
98
        :param err: Standard error
98
99
        :param forbidden_imports: List of forbidden modules
99
100
        """
 
101
        err = err.decode('utf-8')
100
102
        self.addDetail('subprocess_stderr',
101
 
            content.Content(content.ContentType("text", "plain"),
102
 
                lambda:[err]))
 
103
            content.text_content(err))
103
104
 
104
105
        bad_modules = []
105
106
        for module_name in forbidden_imports:
106
 
            if err.find("\nimport %s " % module_name) != -1:
107
 
                bad_modules.append(module_name)
 
107
            if PY3:
 
108
                if err.find("\nimport '%s' " % module_name) != -1:
 
109
                    bad_modules.append(module_name)
 
110
            else:
 
111
                if err.find("\nimport %s " % module_name) != -1:
 
112
                    bad_modules.append(module_name)
108
113
 
109
114
        if bad_modules:
110
115
            self.fail("command loaded forbidden modules %r"
185
190
            'breezy.bzr.xml8',
186
191
            'getpass',
187
192
            'kerberos',
 
193
            'shutil',
188
194
            'ssl',
189
195
            'socket',
190
196
            'smtplib',
192
198
            'tempfile',
193
199
            'termios',
194
200
            'tty',
195
 
            'urllib',
196
201
            ] + old_format_modules)
197
202
        # TODO: similar test for repository-only operations, checking we avoid
198
203
        # loading wt-specific stuff
225
230
        (out, err) = self.finish_bzr_subprocess(process,
226
231
            universal_newlines=False)
227
232
        stderr_file.close()
228
 
        with open('bzr-serve.stderr', 'r') as stderr_file:
 
233
        with open('bzr-serve.stderr', 'rb') as stderr_file:
229
234
            err = stderr_file.read()
230
235
        self.check_forbidden_modules(err,
231
236
            ['breezy.annotate',