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

  • Committer: Vincent Ladeuil
  • Date: 2008-12-04 17:12:46 UTC
  • mto: (3902.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3903.
  • Revision ID: v.ladeuil+lp@free.fr-20081204171246-p28b3u0e2alz53iv
Fix bug #270863 by preserving 'bzr+http[s]' decorator.

* bzrlib/transport/remote.py:
(RemoteHTTPTransport._redirected_to): Specific implementation to
handle the redirections.

* bzrlib/transport/http/_urllib.py:
(HttpTransport_urllib.__init__): Fix parameter order.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport.__init__): Fix parameter order.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase.external_url): Semi drive-by fix, external_url
shouldn't expose the implementation qualifier (it's private to bzr
not externally usable).

* bzrlib/transport/decorator.py:
(TransportDecorator._redirected_to): Cleanup.

* bzrlib/tests/test_smart_transport.py:
(RemoteHTTPTransportTestCase): Add specific tests for
_redirected_to.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/commands/test_branch.py
 
1
# Copyright (C) 2007 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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
 
16
 
 
17
 
 
18
from bzrlib.builtins import cmd_branch
 
19
from bzrlib.tests.transport_util import TestCaseWithConnectionHookedTransport
 
20
 
 
21
 
 
22
class TestBranch(TestCaseWithConnectionHookedTransport):
 
23
 
 
24
    def setUp(self):
 
25
        super(TestBranch, self).setUp()
 
26
        self.make_branch_and_tree('branch')
 
27
        self.start_logging_connections()
 
28
 
 
29
    def test_branch_remote_local(self):
 
30
        cmd = cmd_branch()
 
31
        cmd.run(self.get_url('branch'), 'local')
 
32
        self.assertEquals(1, len(self.connections))
 
33
 
 
34
    def test_branch_local_remote(self):
 
35
        cmd = cmd_branch()
 
36
        cmd.run('branch', self.get_url('remote'))
 
37
        self.assertEquals(1, len(self.connections))
 
38
 
 
39
    def test_branch_remote_remote(self):
 
40
        cmd = cmd_branch()
 
41
        cmd.run(self.get_url('branch'), self.get_url('remote'))
 
42
        self.assertEquals(2, len(self.connections))
 
43