← 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: Robert J. Tanner
  • Date: 2009-04-30 22:40:42 UTC
  • mfrom: (4323 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4324.
  • Revision ID: tanner@real-time.com-20090430224042-53v45axtue5bw45l
Merge 1.14.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_request.py
199
199
        # A child of a transport in jail_info is allowed
200
200
        _pre_open_hook(t.clone('child'))
201
201
        # A parent is not allowed
202
 
        self.assertRaises(errors.BzrError, _pre_open_hook, t.clone('..'))
 
202
        self.assertRaises(errors.JailBreak, _pre_open_hook, t.clone('..'))
203
203
        # A completely unrelated transport is not allowed
204
204
        self.assertRaises(
205
 
            errors.BzrError, _pre_open_hook, get_transport('http://host/'))
 
205
            errors.JailBreak, _pre_open_hook, get_transport('http://host/'))
206
206
 
207
207
    def test_open_bzrdir_in_non_main_thread(self):
208
208
        """Opening a bzrdir in a non-main thread should work ok.