~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
2485.8.7 by Vincent Ladeuil
Add test for pull.
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
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2485.8.7 by Vincent Ladeuil
Add test for pull.
16
17
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
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):
2485.8.7 by Vincent Ladeuil
Add test for pull.
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')
2485.8.36 by Vincent Ladeuil
Fix test suite to provide a better debugging experience.
32
2814.11.1 by Vincent Ladeuil
Renamed install_hooks to start_logging_connections (as per Martin suggestion).
33
        self.start_logging_connections()
2485.8.7 by Vincent Ladeuil
Add test for pull.
34
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
35
        cmd = builtins.cmd_pull()
2485.8.7 by Vincent Ladeuil
Add test for pull.
36
        # We don't care about the ouput but 'outf' should be defined
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
37
        cmd.outf = tests.StringIOWrapper()
5141.2.1 by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
38
        cmd.run(self.get_url('branch1'), directory='branch2')
2485.8.7 by Vincent Ladeuil
Add test for pull.
39
        self.assertEquals(1, len(self.connections))
40
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
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()
5141.2.1 by Robert Collins
``bzrlib.commands.Command.run_direct`` is no longer needed - the pre
56
        pull.run(self.get_url('remote'), directory='local')
6110.1.1 by John Arbash Meinel
Merge MvG's bugfix for #483661. Needs a couple small tweaks.
57
        self.assertEquals(2, len(self.connections))
2817.4.3 by Vincent Ladeuil
Add tests for commit, reuse master branch transport.
58