~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transport.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
180
180
        self.check([(0, 20, [(0, 10), (10, 10)])],
181
181
                   [(0, 10), (10, 10)])
182
182
 
183
 
    # XXX: scary, http.readv() can't handle that --vila20071209
184
183
    def test_coalesce_overlapped(self):
185
 
        self.check([(0, 15, [(0, 10), (5, 10)])],
186
 
                   [(0, 10), (5, 10)])
 
184
        self.assertRaises(ValueError,
 
185
            self.check, [(0, 15, [(0, 10), (5, 10)])],
 
186
                        [(0, 10), (5, 10)])
187
187
 
188
188
    def test_coalesce_limit(self):
189
189
        self.check([(10, 50, [(0, 10), (10, 10), (20, 10),