/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/blackbox/test_added.py

  • Committer: v.ladeuil+lp at free
  • Date: 2007-02-04 17:41:12 UTC
  • mto: (2323.7.1 redirection)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: v.ladeuil+lp@free.fr-20070204174112-iv6gxzinnjddlaxj
Add tests for redirection. Preserve transport decorations.

* bzrlib/tests/test_http.py:
(TestRedirections): new tests.

* bzrlib/tests/HttpServer.py:
(HttpServer): Make server host and port public once the socket
have been established.

* bzrlib/tests/HTTPTestUtil.py:
(RedirectRequestHandler, HTTPServerRedirecting): New http test
server for redirections. Only a whole host can be redirected, so
far.

* bzrlib/errors.py:
(RedirectRequested.__init__): Add a 'qual_proto' oso that
transport decorations can be transmitted to redirected transport.
(RedirectRequested._requalify_url,
RedirectRequested.get_source_url,
RedirectRequested.get_target_url): New methods providing fully
decorated urls.

* bzrlib/bzrdir.py:
(BzrDir.open_from_transport): The redirection should preserve
transport decorations.
(BzrDirMetaFormat1): To be able to specialize bzr branches from
foreign branches, we need to register BzrDirMetaFormat1 as the
default control format (instead of BzrDirMetaFormat which is
abstract and can still be used by foreign branches).

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
# Copyright (C) 2006 Canonical Ltd
 
2
# -*- coding: utf-8 -*-
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
17
 
 
18
 
 
19
"""Black-box tests for 'bzr added', which shows newly-added files."""
 
20
 
 
21
import os
 
22
 
 
23
from bzrlib.branch import Branch
 
24
from bzrlib.tests import TestCaseInTempDir
 
25
from bzrlib.tests.treeshape import build_tree_contents
 
26
 
 
27
class TestAdded(TestCaseInTempDir):
 
28
 
 
29
    def test_added(self):
 
30
        """Test that 'added' command reports added files"""
 
31
 
 
32
        def check_added(expected):
 
33
            out, err = self.run_bzr_captured(['added'])
 
34
            self.assertEquals(out, expected)
 
35
            self.assertEquals(err, '')
 
36
 
 
37
        def bzr(*args):
 
38
            self.run_bzr(*args)
 
39
 
 
40
        # in empty directory, nothing added
 
41
        bzr('init')
 
42
        check_added('')
 
43
 
 
44
        # with unknown file, still nothing added
 
45
        build_tree_contents([('a', 'contents of a\n')])
 
46
        check_added('')
 
47
 
 
48
        # after add, shows up in list
 
49
        # bug report 20060119 by Nathan McCallum -- 'bzr added' causes
 
50
        # NameError
 
51
        bzr('add', 'a')
 
52
        check_added('a\n')
 
53
 
 
54
        # after commit, now no longer listed
 
55
        bzr('commit', '-m', 'add a')
 
56
        check_added('')