← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/commands/test_pull.py

  • Committer: Alexander Belchenko
  • Date: 2010-06-17 08:53:15 UTC
  • mfrom: (5300 +trunk)
  • mto: (5303.2.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5305.
  • Revision ID: bialix@ukr.net-20100617085315-hr8186zck57zn35s
merge bzr.dev; fix NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_pull.py
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_direct(self.get_url('branch1'), directory='branch2')
 
38
        cmd.run(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_direct(self.get_url('remote'), directory='local')
 
56
        pull.run(self.get_url('remote'), directory='local')
57
57
        self.assertEquals(1, len(self.connections))
58
58