~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-01-29 10:36:23 UTC
  • mto: This revision was merged to the branch mainline in revision 4992.
  • Revision ID: mbp@sourcefrog.net-20100129103623-hywka5hymo5z13jw
Change url to canonical.com or wiki, plus some doc improvements in passing

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
 
18
from bzrlib import (
 
19
    branch,
 
20
    builtins,
 
21
    tests,
 
22
    )
 
23
from bzrlib.tests import transport_util
 
24
 
 
25
 
 
26
class TestPull(transport_util.TestCaseWithConnectionHookedTransport):
 
27
 
 
28
    def test_pull(self):
 
29
        wt1 = self.make_branch_and_tree('branch1')
 
30
        tip = wt1.commit('empty commit')
 
31
        wt2 = self.make_branch_and_tree('branch2')
 
32
 
 
33
        self.start_logging_connections()
 
34
 
 
35
        cmd = builtins.cmd_pull()
 
36
        # We don't care about the ouput but 'outf' should be defined
 
37
        cmd.outf = tests.StringIOWrapper()
 
38
        cmd.run_direct(self.get_url('branch1'), directory='branch2')
 
39
        self.assertEquals(1, len(self.connections))
 
40
 
 
41
    def test_pull_with_bound_branch(self):
 
42
 
 
43
        master_wt = self.make_branch_and_tree('master')
 
44
        local_wt = self.make_branch_and_tree('local')
 
45
        master_branch = branch.Branch.open(self.get_url('master'))
 
46
        local_wt.branch.bind(master_branch)
 
47
 
 
48
        remote_wt = self.make_branch_and_tree('remote')
 
49
        remote_wt.commit('empty commit')
 
50
 
 
51
        self.start_logging_connections()
 
52
 
 
53
        pull = builtins.cmd_pull()
 
54
        # We don't care about the ouput but 'outf' should be defined
 
55
        pull.outf = tests.StringIOWrapper()
 
56
        pull.run_direct(self.get_url('remote'), directory='local')
 
57
        self.assertEquals(1, len(self.connections))
 
58