/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_push.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_push.py
1
 
# Copyright (C) 2007-2010, 2016 Canonical Ltd
 
1
# Copyright (C) 2007-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 ...builtins import cmd_push
18
 
from .. import (
19
 
    transport_util,
20
 
    ui_testing,
21
 
    )
22
 
 
23
 
 
24
 
class TestPush(transport_util.TestCaseWithConnectionHookedTransport):
 
17
 
 
18
from bzrlib import tests
 
19
from bzrlib.builtins import cmd_push
 
20
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
 
21
 
 
22
 
 
23
class TestPush(TestCaseWithConnectionHookedTransport):
25
24
 
26
25
    def test_push(self):
27
26
        self.make_branch_and_tree('branch')
30
29
 
31
30
        cmd = cmd_push()
32
31
        # We don't care about the ouput but 'outf' should be defined
33
 
        cmd.outf = ui_testing.StringIOWithEncoding()
 
32
        cmd.outf = tests.StringIOWrapper()
34
33
        cmd.run(self.get_url('remote'), directory='branch')
35
 
        self.assertEqual(1, len(self.connections))
 
34
        self.assertEquals(1, len(self.connections))
36
35
 
37
36
    def test_push_onto_stacked(self):
38
37
        self.make_branch_and_tree('base', format='1.9')
41
40
        self.start_logging_connections()
42
41
 
43
42
        cmd = cmd_push()
44
 
        cmd.outf = ui_testing.StringIOWithEncoding()
 
43
        cmd.outf = tests.StringIOWrapper()
45
44
        cmd.run(self.get_url('remote'), directory='source',
46
45
                stacked_on=self.get_url('base'))
47
46
        self.assertEqual(1, len(self.connections))