/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 bzrlib/tests/commands/test_pull.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-12 22:51:31 UTC
  • mto: This revision was merged to the branch mainline in revision 4955.
  • Revision ID: john@arbash-meinel.com-20100112225131-he8h411p6aeeb947
Delay grabbing an output stream until we actually go to show a diff.

This makes the test suite happy, but it also seems to be reasonable.
If we aren't going to write anything, we don't need to hold an
output stream open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_pull.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
35
35
        cmd = builtins.cmd_pull()
36
36
        # We don't care about the ouput but 'outf' should be defined
37
37
        cmd.outf = tests.StringIOWrapper()
38
 
        cmd.run(self.get_url('branch1'), directory='branch2')
 
38
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
39
39
        self.assertEquals(1, len(self.connections))
40
40
 
41
41
    def test_pull_with_bound_branch(self):
53
53
        pull = builtins.cmd_pull()
54
54
        # We don't care about the ouput but 'outf' should be defined
55
55
        pull.outf = tests.StringIOWrapper()
56
 
        pull.run(self.get_url('remote'), directory='local')
 
56
        pull.run_direct(self.get_url('remote'), directory='local')
57
57
        self.assertEquals(1, len(self.connections))
58
58