/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_update.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_update.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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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 TestUpdate(transport_util.TestCaseWithConnectionHookedTransport):
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
 
 
18
from bzrlib import builtins
 
19
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
 
20
 
 
21
 
 
22
class TestUpdate(TestCaseWithConnectionHookedTransport):
27
23
 
28
24
    def test_update(self):
29
 
        remote_wt = self.make_branch_and_tree('remote')
30
 
        local_wt = self.make_branch_and_tree('local')
31
 
 
32
 
        remote_branch = branch.Branch.open(self.get_url('remote'))
33
 
        local_wt.branch.bind(remote_branch)
34
 
 
35
 
        remote_wt.commit('empty commit')
36
 
 
37
 
        self.start_logging_connections()
 
25
        wt1 = self.make_branch_and_tree('branch1')
 
26
        wt2 = self.make_branch_and_tree('branch2')
 
27
        wt2.pull(wt1.branch)
 
28
 
 
29
        wt1.commit('empty commit')
 
30
        wt2.commit('empty commit too')
 
31
 
 
32
        bind = builtins.cmd_bind()
 
33
        bind.run(location=self.get_url('branch1'))
 
34
 
 
35
        self.install_hooks()
38
36
 
39
37
        update = builtins.cmd_update()
40
 
        # update needs the encoding from outf to print URLs
41
 
        update.outf = tests.StringIOWrapper()
42
 
        # update calls it 'dir' where other commands calls it 'directory'
43
 
        update.run(dir='local')
 
38
        update.run()
44
39
        self.assertEquals(1, len(self.connections))
45
40