← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2016-04-21 04:10:52 UTC
  • mfrom: (6616.1.1 fix-en-user-guide)
  • Revision ID: pqm@pqm.ubuntu.com-20160421041052-clcye7ns1qcl2n7w
(richard-wilbur) Ensure build of English use guide always uses English text
 even when user's locale specifies a different language. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_push.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007-2010, 2016 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
from bzrlib import tests
31
31
        # We don't care about the ouput but 'outf' should be defined
32
32
        cmd.outf = tests.StringIOWrapper()
33
33
        cmd.run(self.get_url('remote'), directory='branch')
34
 
        self.assertEquals(1, len(self.connections))
 
34
        self.assertEqual(1, len(self.connections))
 
35
 
 
36
    def test_push_onto_stacked(self):
 
37
        self.make_branch_and_tree('base', format='1.9')
 
38
        self.make_branch_and_tree('source', format='1.9')
 
39
 
 
40
        self.start_logging_connections()
 
41
 
 
42
        cmd = cmd_push()
 
43
        cmd.outf = tests.StringIOWrapper()
 
44
        cmd.run(self.get_url('remote'), directory='source',
 
45
                stacked_on=self.get_url('base'))
 
46
        self.assertEqual(1, len(self.connections))