/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/blackbox/test_cat.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_cat.py
18
18
"""Black-box tests for brz cat.
19
19
"""
20
20
 
21
 
from breezy import tests
22
 
from breezy.tests.matchers import ContainsNoVfsCalls
23
 
from breezy.transport import memory
 
21
from ... import tests
 
22
from ..matchers import ContainsNoVfsCalls
 
23
from ...transport import memory
24
24
 
25
25
 
26
26
class TestCat(tests.TestCaseWithTransport):
161
161
        # subprocess because we really need to patch in a plugin that
162
162
        # registers the filters. Instead, we patch in a custom
163
163
        # filter_stack and use run_bzr() ...
164
 
        from cStringIO import StringIO
165
 
        from breezy.commands import run_bzr
166
 
        from breezy.tests.test_filters import _stack_2
167
 
        from breezy.trace import mutter
168
 
        from breezy.tree import Tree
 
164
        from ..test_filters import _stack_2
 
165
        from ...tree import Tree
169
166
        wt = self.make_branch_and_tree('.')
170
167
        self.build_tree_contents([
171
168
            ('README', "junk\nline 1 of README\nline 2 of README\n"),