← 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 Collins
  • Date: 2009-03-27 04:10:25 UTC
  • mfrom: (4208 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4216.
  • Revision ID: robertc@robertcollins.net-20090327041025-rgutx4q03xo4pq6l
Resolve NEWS conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_request.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for smart server request infrastructure (bzrlib.smart.request)."""
18
18
 
 
19
import threading
 
20
 
19
21
from bzrlib import errors
 
22
from bzrlib.bzrdir import BzrDir
20
23
from bzrlib.smart import request
21
 
from bzrlib.tests import TestCase
 
24
from bzrlib.tests import TestCase, TestCaseWithMemoryTransport
 
25
from bzrlib.transport import get_transport
22
26
 
23
27
 
24
28
class NoBodyRequest(request.SmartServerRequest):
61
65
        raise errors.NoSuchFile('xyzzy')
62
66
 
63
67
 
 
68
class CheckJailRequest(request.SmartServerRequest):
 
69
 
 
70
    def __init__(self, *args):
 
71
        request.SmartServerRequest.__init__(self, *args)
 
72
        self.jail_transports_log = []
 
73
 
 
74
    def do(self):
 
75
        self.jail_transports_log.append(request.jail_info.transports)
 
76
 
 
77
    def do_chunk(self, bytes):
 
78
        self.jail_transports_log.append(request.jail_info.transports)
 
79
 
 
80
    def do_end(self):
 
81
        self.jail_transports_log.append(request.jail_info.transports)
 
82
 
 
83
 
64
84
class TestSmartRequest(TestCase):
65
85
 
66
86
    def test_request_class_without_do_body(self):
76
96
        handler.end_received()
77
97
        # Request done, no exception was raised.
78
98
 
 
99
    def test_only_request_code_is_jailed(self):
 
100
        transport = 'dummy transport'
 
101
        handler = request.SmartServerRequestHandler(
 
102
            transport, {'foo': CheckJailRequest}, '/')
 
103
        handler.args_received(('foo',))
 
104
        self.assertEqual(None, request.jail_info.transports)
 
105
        handler.accept_body('bytes')
 
106
        self.assertEqual(None, request.jail_info.transports)
 
107
        handler.end_received()
 
108
        self.assertEqual(None, request.jail_info.transports)
 
109
        self.assertEqual(
 
110
            [[transport]] * 3, handler._command.jail_transports_log)
 
111
 
 
112
 
79
113
 
80
114
class TestSmartRequestHandlerErrorTranslation(TestCase):
81
115
    """Tests that SmartServerRequestHandler will translate exceptions raised by
134
168
            ('TokenMismatch', 'some-token', 'actual-token'),
135
169
            errors.TokenMismatch('some-token', 'actual-token'))
136
170
 
 
171
 
 
172
class TestRequestJail(TestCaseWithMemoryTransport):
 
173
    
 
174
    def test_jail(self):
 
175
        transport = self.get_transport('blah')
 
176
        req = request.SmartServerRequest(transport)
 
177
        self.assertEqual(None, request.jail_info.transports)
 
178
        req.setup_jail()
 
179
        self.assertEqual([transport], request.jail_info.transports)
 
180
        req.teardown_jail()
 
181
        self.assertEqual(None, request.jail_info.transports)
 
182
 
 
183
 
 
184
class TestJailHook(TestCaseWithMemoryTransport):
 
185
 
 
186
    def tearDown(self):
 
187
        request.jail_info.transports = None
 
188
        TestCaseWithMemoryTransport.tearDown(self)
 
189
 
 
190
    def test_jail_hook(self):
 
191
        request.jail_info.transports = None
 
192
        _pre_open_hook = request._pre_open_hook
 
193
        # Any transport is fine if jail_info.transports is None
 
194
        t = self.get_transport('foo')
 
195
        _pre_open_hook(t)
 
196
        # A transport in jail_info.transports is allowed
 
197
        request.jail_info.transports = [t]
 
198
        _pre_open_hook(t)
 
199
        # A child of a transport in jail_info is allowed
 
200
        _pre_open_hook(t.clone('child'))
 
201
        # A parent is not allowed
 
202
        self.assertRaises(errors.BzrError, _pre_open_hook, t.clone('..'))
 
203
        # A completely unrelated transport is not allowed
 
204
        self.assertRaises(
 
205
            errors.BzrError, _pre_open_hook, get_transport('http://host/'))
 
206
 
 
207
    def test_open_bzrdir_in_non_main_thread(self):
 
208
        """Opening a bzrdir in a non-main thread should work ok.
 
209
        
 
210
        This makes sure that the globally-installed
 
211
        bzrlib.smart.request._pre_open_hook, which uses a threading.local(),
 
212
        works in a newly created thread.
 
213
        """
 
214
        bzrdir = self.make_bzrdir('.')
 
215
        transport = bzrdir.root_transport
 
216
        thread_result = []
 
217
        def t():
 
218
            BzrDir.open_from_transport(transport)
 
219
            thread_result.append('ok')
 
220
        thread = threading.Thread(target=t)
 
221
        thread.start()
 
222
        thread.join()
 
223
        self.assertEqual(['ok'], thread_result)
 
224