← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart_request.py

  • Committer: Vincent Ladeuil
  • Date: 2016-01-21 17:48:07 UTC
  • mto: This revision was merged to the branch mainline in revision 6613.
  • Revision ID: v.ladeuil+lp@free.fr-20160121174807-g4ybpaij9ln5wj6a
https://launchpad.net/bugs/106898
Make all transport put_bytes() raises TypeError when given unicode strings rather than bytes.

There was a mix of AssertionError or UnicodeEncodeError.

Also deleted test_put_file_unicode() which was bogus, files contain bytes not unicode strings.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_request.py
118
118
        self.assertEqual(
119
119
            [[transport]] * 3, handler._command.jail_transports_log)
120
120
 
 
121
    def test_all_registered_requests_are_safety_qualified(self):
 
122
        unclassified_requests = []
 
123
        allowed_info = ('read', 'idem', 'mutate', 'semivfs', 'semi', 'stream')
 
124
        for key in request.request_handlers.keys():
 
125
            info = request.request_handlers.get_info(key)
 
126
            if info is None or info not in allowed_info:
 
127
                unclassified_requests.append(key)
 
128
        if unclassified_requests:
 
129
            self.fail('These requests were not categorized as safe/unsafe'
 
130
                      ' to retry: %s'  % (unclassified_requests,))
121
131
 
122
132
 
123
133
class TestSmartRequestHandlerErrorTranslation(TestCase):
240
250
        self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..'))
241
251
        # A completely unrelated transport is not allowed
242
252
        self.assertRaises(errors.JailBreak, _pre_open_hook,
243
 
                          transport.get_transport('http://host/'))
 
253
                          transport.get_transport_from_url('http://host/'))
244
254
 
245
255
    def test_open_bzrdir_in_non_main_thread(self):
246
256
        """Opening a bzrdir in a non-main thread should work ok.