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

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transport_implementations.py
1332
1332
 
1333
1333
        # This is intentionally reading off the end of the file
1334
1334
        # since we are sure that it cannot get there
1335
 
        self.assertListRaises((errors.ShortReadvError, AssertionError),
 
1335
        self.assertListRaises((errors.ShortReadvError, errors.InvalidRange,
 
1336
                               # Can be raised by paramiko
 
1337
                               AssertionError),
1336
1338
                              transport.readv, 'a', [(1,1), (8,10)])
1337
1339
 
1338
1340
        # This is trying to seek past the end of the file, it should
1339
1341
        # also raise a special error
1340
 
        self.assertListRaises(errors.ShortReadvError,
 
1342
        self.assertListRaises((errors.ShortReadvError, errors.InvalidRange),
1341
1343
                              transport.readv, 'a', [(12,2)])