~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
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
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.assertEqual(1, len(self.connections))
 
34
        self.assertEquals(1, len(self.connections))
35
35
 
36
36
    def test_push_onto_stacked(self):
37
37
        self.make_branch_and_tree('base', format='1.9')