/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/commands/test_pull.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/commands/test_pull.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
 
18
 
from breezy import (
 
17
from ... import (
19
18
    branch,
20
19
    builtins,
21
 
    tests,
22
 
    )
23
 
from breezy.tests import transport_util
 
20
    )
 
21
from .. import (
 
22
    transport_util,
 
23
    ui_testing,
 
24
    )
24
25
 
25
26
 
26
27
class TestPull(transport_util.TestCaseWithConnectionHookedTransport):
34
35
 
35
36
        cmd = builtins.cmd_pull()
36
37
        # We don't care about the ouput but 'outf' should be defined
37
 
        cmd.outf = tests.StringIOWrapper()
 
38
        cmd.outf = ui_testing.StringIOWithEncoding()
38
39
        cmd.run(self.get_url('branch1'), directory='branch2')
39
40
        self.assertEqual(1, len(self.connections))
40
41
 
52
53
 
53
54
        pull = builtins.cmd_pull()
54
55
        # We don't care about the ouput but 'outf' should be defined
55
 
        pull.outf = tests.StringIOWrapper()
 
56
        pull.outf = ui_testing.StringIOWithEncoding()
56
57
        pull.run(self.get_url('remote'), directory='local')
57
58
        self.assertEqual(2, len(self.connections))
58
59