/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_ancestry.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_ancestry.py
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
import os
18
18
 
 
19
from bzrlib.builtins import merge
19
20
from bzrlib.tests import TestCaseWithTransport
20
21
from bzrlib.workingtree import WorkingTree
21
22
from bzrlib.branch import Branch
25
26
 
26
27
    def _build_branches(self):
27
28
        a_wt = self.make_branch_and_tree('A')
28
 
        self.build_tree_contents([('A/foo', '1111\n')])
 
29
        open('A/foo', 'wb').write('1111\n')
29
30
        a_wt.add('foo')
30
31
        a_wt.commit('added foo',rev_id='A1')
31
 
 
32
 
        b_wt = a_wt.bzrdir.sprout('B').open_workingtree()
33
 
        self.build_tree_contents([('B/foo', '1111\n22\n')])
 
32
        self.run_bzr_captured(['branch', 'A', 'B'])
 
33
        b_wt = WorkingTree.open('B')
 
34
        open('B/foo','wb').write('1111\n22\n')
34
35
        b_wt.commit('modified B/foo',rev_id='B1')
35
 
 
36
 
        self.build_tree_contents([('A/foo', '000\n1111\n')])
 
36
        open('A/foo', 'wb').write('000\n1111\n')
37
37
        a_wt.commit('modified A/foo',rev_id='A2')
38
 
 
39
 
        a_wt.merge_from_branch(b_wt.branch, b_wt.last_revision(),
40
 
            b_wt.branch.get_rev_id(1))
 
38
        merge(['B',-1],['B',1],this_dir='A')
41
39
        a_wt.commit('merged B into A',rev_id='A3')
42
 
        return a_wt, b_wt
43
40
 
44
41
    def _check_ancestry(self, location='', result=None):
45
 
        out = self.run_bzr(['ancestry', location])[0]
46
 
        if result is not None:
47
 
            self.assertEqualDiff(result, out)
48
 
        else:
49
 
            # A2 and B1 can be in either order, because they are parallel, and
50
 
            # thus their topological order is not defined
 
42
        out = self.capture('ancestry ' + location)
 
43
        if result is None:
51
44
            result = "A1\nB1\nA2\nA3\n"
52
 
            if result != out:
53
 
                result = "A1\nA2\nB1\nA3\n"
54
 
            self.assertEqualDiff(result, out)
 
45
        self.assertEqualDiff(out, result)
55
46
 
56
47
    def test_ancestry(self):
57
48
        """Tests 'ancestry' command"""
67
58
    def test_ancestry_with_repo_branch(self):
68
59
        """Tests 'ancestry' command with a location that is a
69
60
        repository branch."""
70
 
        a_tree = self._build_branches()[0]
71
 
 
72
 
        self.make_repository('repo', shared=True)
73
 
 
74
 
        a_tree.bzrdir.sprout('repo/A')
 
61
        self._build_branches()
 
62
        self.run_bzr('init-repo', 'repo')
 
63
        self.run_bzr('branch', 'A', 'repo/A')
75
64
        self._check_ancestry('repo/A')
76
65
 
77
66
    def test_ancestry_with_checkout(self):
78
67
        """Tests 'ancestry' command with a location that is a
79
68
        checkout of a repository branch."""
80
 
        a_tree = self._build_branches()[0]
81
 
        self.make_repository('repo', shared=True)
82
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
83
 
        repo_branch.create_checkout('A-checkout')
 
69
        self._build_branches()
 
70
        self.run_bzr('init-repo', 'repo')
 
71
        self.run_bzr('branch', 'A', 'repo/A')
 
72
        self.run_bzr('checkout', 'repo/A', 'A-checkout')
84
73
        self._check_ancestry('A-checkout')
85
74
 
86
75
    def test_ancestry_with_lightweight_checkout(self):
87
76
        """Tests 'ancestry' command with a location that is a
88
77
        lightweight checkout of a repository branch."""
89
 
        a_tree = self._build_branches()[0]
90
 
        self.make_repository('repo', shared=True)
91
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
92
 
        repo_branch.create_checkout('A-checkout', lightweight=True)
 
78
        self._build_branches()
 
79
        self.run_bzr('init-repo', 'repo')
 
80
        self.run_bzr('branch', 'A', 'repo/A')
 
81
        self.run_bzr('checkout', '--lightweight', 'repo/A', 'A-checkout')
93
82
        self._check_ancestry('A-checkout')
94
83
 
95
84
    def test_ancestry_with_truncated_checkout(self):
96
85
        """Tests 'ancestry' command with a location that is a
97
86
        checkout of a repository branch with a shortened revision history."""
98
 
        a_tree = self._build_branches()[0]
99
 
        self.make_repository('repo', shared=True)
100
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
101
 
        repo_branch.create_checkout('A-checkout',
102
 
                                    revision_id=repo_branch.get_rev_id(2))
 
87
        self._build_branches()
 
88
        self.run_bzr('init-repo', 'repo')
 
89
        self.run_bzr('branch', 'A', 'repo/A')
 
90
        self.run_bzr('checkout', '-r', '2', 'repo/A', 'A-checkout')
103
91
        self._check_ancestry('A-checkout', "A1\nA2\n")
104
92
 
105
93
    def test_ancestry_with_truncated_lightweight_checkout(self):
106
94
        """Tests 'ancestry' command with a location that is a lightweight
107
95
        checkout of a repository branch with a shortened revision history."""
108
 
        a_tree = self._build_branches()[0]
109
 
        self.make_repository('repo', shared=True)
110
 
        repo_branch = a_tree.bzrdir.sprout('repo/A').open_branch()
111
 
        repo_branch.create_checkout('A-checkout',
112
 
                                    revision_id=repo_branch.get_rev_id(2),
113
 
                                    lightweight=True)
 
96
        self._build_branches()
 
97
        self.run_bzr('init-repo', 'repo')
 
98
        self.run_bzr('branch', 'A', 'repo/A')
 
99
        self.run_bzr('checkout', '-r', '2', '--lightweight',
 
100
                'repo/A', 'A-checkout')
114
101
        self._check_ancestry('A-checkout', "A1\nA2\n")