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

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
 
1
# Copyright (C) 2005, 2006 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
"""Black-box tests for bzr branch."""
 
19
 
 
20
import os
 
21
 
 
22
from bzrlib import branch, bzrdir
 
23
from bzrlib.repository import RepositoryFormatKnit1
 
24
from bzrlib.tests.blackbox import ExternalBase
 
25
from bzrlib.workingtree import WorkingTree
 
26
 
 
27
 
 
28
class TestBranch(ExternalBase):
 
29
 
 
30
    def example_branch(test):
 
31
        test.runbzr('init')
 
32
        file('hello', 'wt').write('foo')
 
33
        test.runbzr('add hello')
 
34
        test.runbzr('commit -m setup hello')
 
35
        file('goodbye', 'wt').write('baz')
 
36
        test.runbzr('add goodbye')
 
37
        test.runbzr('commit -m setup goodbye')
 
38
 
 
39
    def test_branch(self):
 
40
        """Branch from one branch to another."""
 
41
        os.mkdir('a')
 
42
        os.chdir('a')
 
43
        self.example_branch()
 
44
        os.chdir('..')
 
45
        self.runbzr('branch a b')
 
46
        b = branch.Branch.open('b')
 
47
        self.assertEqual('b\n', b.control_files.get_utf8('branch-name').read())
 
48
        self.runbzr('branch a c -r 1')
 
49
        os.chdir('b')
 
50
        self.runbzr('commit -m foo --unchanged')
 
51
        os.chdir('..')
 
52
 
 
53
    def test_branch_basis(self):
 
54
        # ensure that basis really does grab from the basis by having incomplete source
 
55
        tree = self.make_branch_and_tree('commit_tree')
 
56
        self.build_tree(['foo'], transport=tree.bzrdir.transport.clone('..'))
 
57
        tree.add('foo')
 
58
        tree.commit('revision 1', rev_id='1')
 
59
        source = self.make_branch_and_tree('source')
 
60
        # this gives us an incomplete repository
 
61
        tree.bzrdir.open_repository().copy_content_into(source.branch.repository)
 
62
        tree.commit('revision 2', rev_id='2', allow_pointless=True)
 
63
        tree.bzrdir.open_branch().copy_content_into(source.branch)
 
64
        tree.copy_content_into(source)
 
65
        self.assertFalse(source.branch.repository.has_revision('2'))
 
66
        dir = source.bzrdir
 
67
        self.runbzr('branch source target --basis commit_tree')
 
68
        target = bzrdir.BzrDir.open('target')
 
69
        self.assertEqual('2', target.open_branch().last_revision())
 
70
        self.assertEqual(['2'], target.open_workingtree().get_parent_ids())
 
71
        self.assertTrue(target.open_branch().repository.has_revision('2'))
 
72
 
 
73
    def test_branch_only_copies_history(self):
 
74
        # Knit branches should only push the history for the current revision.
 
75
        format = bzrdir.BzrDirMetaFormat1()
 
76
        format.repository_format = RepositoryFormatKnit1()
 
77
        shared_repo = self.make_repository('repo', format=format, shared=True)
 
78
        shared_repo.set_make_working_trees(True)
 
79
 
 
80
        def make_shared_tree(path):
 
81
            shared_repo.bzrdir.root_transport.mkdir(path)
 
82
            shared_repo.bzrdir.create_branch_convenience('repo/' + path)
 
83
            return WorkingTree.open('repo/' + path)
 
84
        tree_a = make_shared_tree('a')
 
85
        self.build_tree(['repo/a/file'])
 
86
        tree_a.add('file')
 
87
        tree_a.commit('commit a-1', rev_id='a-1')
 
88
        f = open('repo/a/file', 'ab')
 
89
        f.write('more stuff\n')
 
90
        f.close()
 
91
        tree_a.commit('commit a-2', rev_id='a-2')
 
92
 
 
93
        tree_b = make_shared_tree('b')
 
94
        self.build_tree(['repo/b/file'])
 
95
        tree_b.add('file')
 
96
        tree_b.commit('commit b-1', rev_id='b-1')
 
97
 
 
98
        self.assertTrue(shared_repo.has_revision('a-1'))
 
99
        self.assertTrue(shared_repo.has_revision('a-2'))
 
100
        self.assertTrue(shared_repo.has_revision('b-1'))
 
101
 
 
102
        # Now that we have a repository with shared files, make sure
 
103
        # that things aren't copied out by a 'branch'
 
104
        self.run_bzr('branch', 'repo/b', 'branch-b')
 
105
        pushed_tree = WorkingTree.open('branch-b')
 
106
        pushed_repo = pushed_tree.branch.repository
 
107
        self.assertFalse(pushed_repo.has_revision('a-1'))
 
108
        self.assertFalse(pushed_repo.has_revision('a-2'))
 
109
        self.assertTrue(pushed_repo.has_revision('b-1'))
 
110
 
 
111