/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: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_pull.py
1
 
# Copyright (C) 2007, 2009, 2010, 2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
from ... import (
 
17
 
 
18
from bzrlib import (
18
19
    branch,
19
20
    builtins,
20
 
    )
21
 
from .. import (
22
 
    transport_util,
23
 
    ui_testing,
24
 
    )
 
21
    tests,
 
22
    )
 
23
from bzrlib.tests import transport_util
25
24
 
26
25
 
27
26
class TestPull(transport_util.TestCaseWithConnectionHookedTransport):
35
34
 
36
35
        cmd = builtins.cmd_pull()
37
36
        # We don't care about the ouput but 'outf' should be defined
38
 
        cmd.outf = ui_testing.StringIOWithEncoding()
 
37
        cmd.outf = tests.StringIOWrapper()
39
38
        cmd.run(self.get_url('branch1'), directory='branch2')
40
 
        self.assertEqual(1, len(self.connections))
 
39
        self.assertEquals(1, len(self.connections))
41
40
 
42
41
    def test_pull_with_bound_branch(self):
43
42
 
53
52
 
54
53
        pull = builtins.cmd_pull()
55
54
        # We don't care about the ouput but 'outf' should be defined
56
 
        pull.outf = ui_testing.StringIOWithEncoding()
 
55
        pull.outf = tests.StringIOWrapper()
57
56
        pull.run(self.get_url('remote'), directory='local')
58
 
        self.assertEqual(2, len(self.connections))
 
57
        self.assertEquals(1, len(self.connections))
 
58