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

  • Committer: Aaron Bentley
  • Date: 2008-11-03 18:59:14 UTC
  • mfrom: (3818 +trunk)
  • mto: (0.16.99 shelf-ui)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081103185914-inz25vtsiowydw1p
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
992
992
        smart_server.start_background_thread('-' + self.id())
993
993
        try:
994
994
            transport = remote.RemoteTCPTransport(smart_server.get_url())
995
 
            try:
996
 
                transport.get('something')
997
 
            except errors.TransportError, e:
998
 
                self.assertContainsRe(str(e), 'some random exception')
999
 
            else:
1000
 
                self.fail("get did not raise expected error")
 
995
            err = self.assertRaises(errors.UnknownErrorFromSmartServer,
 
996
                transport.get, 'something')
 
997
            self.assertContainsRe(str(err), 'some random exception')
1001
998
            transport.disconnect()
1002
999
        finally:
1003
1000
            smart_server.stop_background_thread()
1091
1088
        # asked for by the client. This gives meaningful and unsurprising errors
1092
1089
        # for users.
1093
1090
        self._captureVar('BZR_NO_SMART_VFS', None)
1094
 
        try:
1095
 
            self.transport.get('not%20a%20file')
1096
 
        except errors.NoSuchFile, e:
1097
 
            self.assertEqual('not%20a%20file', e.path)
1098
 
        else:
1099
 
            self.fail("get did not raise expected error")
 
1091
        err = self.assertRaises(
 
1092
            errors.NoSuchFile, self.transport.get, 'not%20a%20file')
 
1093
        self.assertEqual('not%20a%20file', err.path)
1100
1094
 
1101
1095
    def test_simple_clone_conn(self):
1102
1096
        """Test that cloning reuses the same connection."""
1400
1394
        client_medium = medium.SmartSimplePipesClientMedium(None, None, 'base')
1401
1395
        transport = remote.RemoteTransport(
1402
1396
            'bzr://localhost/', medium=client_medium)
 
1397
        err = errors.ErrorFromSmartServer(("ReadOnlyError", ))
1403
1398
        self.assertRaises(errors.TransportNotPossible,
1404
 
            transport._translate_error, ("ReadOnlyError", ))
 
1399
            transport._translate_error, err)
1405
1400
 
1406
1401
 
1407
1402
class TestSmartProtocol(tests.TestCase):