← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-09-11 06:10:59 UTC
  • mfrom: (3702.1.1 trivial)
  • Revision ID: pqm@pqm.ubuntu.com-20080911061059-svzqfejar17ui4zw
(mbp) KnitVersionedFiles repr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
1
 
# Copyright (C) 2006-2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for the smart wire/domain protocol.
18
18
 
25
25
"""
26
26
 
27
27
import bz2
 
28
from cStringIO import StringIO
 
29
import tarfile
28
30
 
29
31
from bzrlib import (
30
 
    branch as _mod_branch,
31
32
    bzrdir,
32
33
    errors,
 
34
    pack,
 
35
    smart,
33
36
    tests,
34
 
    transport,
35
37
    urlutils,
36
 
    versionedfile,
37
 
    )
38
 
from bzrlib.smart import (
39
 
    branch as smart_branch,
40
 
    bzrdir as smart_dir,
41
 
    repository as smart_repo,
42
 
    packrepository as smart_packrepo,
43
 
    request as smart_req,
44
 
    server,
45
 
    vfs,
46
 
    )
47
 
from bzrlib.tests import test_server
48
 
from bzrlib.transport import (
49
 
    chroot,
50
 
    memory,
51
 
    )
 
38
    )
 
39
from bzrlib.branch import Branch, BranchReferenceFormat
 
40
import bzrlib.smart.branch
 
41
import bzrlib.smart.bzrdir
 
42
import bzrlib.smart.repository
 
43
from bzrlib.smart.request import (
 
44
    FailedSmartServerResponse,
 
45
    SmartServerRequest,
 
46
    SmartServerResponse,
 
47
    SuccessfulSmartServerResponse,
 
48
    )
 
49
from bzrlib.tests import (
 
50
    iter_suite_tests,
 
51
    split_suite_by_re,
 
52
    TestScenarioApplier,
 
53
    )
 
54
from bzrlib.transport import chroot, get_transport
 
55
from bzrlib.util import bencode
52
56
 
53
57
 
54
58
def load_tests(standard_tests, module, loader):
55
59
    """Multiply tests version and protocol consistency."""
56
60
    # FindRepository tests.
57
 
    scenarios = [
 
61
    bzrdir_mod = bzrlib.smart.bzrdir
 
62
    applier = TestScenarioApplier()
 
63
    applier.scenarios = [
58
64
        ("find_repository", {
59
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
 
65
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
60
66
        ("find_repositoryV2", {
61
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
62
 
        ("find_repositoryV3", {
63
 
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
 
67
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
64
68
        ]
65
 
    to_adapt, result = tests.split_suite_by_re(standard_tests,
 
69
    to_adapt, result = split_suite_by_re(standard_tests,
66
70
        "TestSmartServerRequestFindRepository")
67
 
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
 
71
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
68
72
        "_v2")
69
 
    tests.multiply_tests(v1_and_2, scenarios, result)
70
 
    # The first scenario is only applicable to v1 protocols, it is deleted
71
 
    # since.
72
 
    tests.multiply_tests(v2_only, scenarios[1:], result)
 
73
    for test in iter_suite_tests(v1_and_2):
 
74
        result.addTests(applier.adapt(test))
 
75
    del applier.scenarios[0]
 
76
    for test in iter_suite_tests(v2_only):
 
77
        result.addTests(applier.adapt(test))
73
78
    return result
74
79
 
75
80
 
76
81
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
77
82
 
78
83
    def setUp(self):
79
 
        self.vfs_transport_factory = memory.MemoryServer
80
84
        tests.TestCaseWithTransport.setUp(self)
81
85
        self._chroot_server = None
82
86
 
84
88
        if self._chroot_server is None:
85
89
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
86
90
            self._chroot_server = chroot.ChrootServer(backing_transport)
87
 
            self.start_server(self._chroot_server)
88
 
        t = transport.get_transport(self._chroot_server.get_url())
 
91
            self._chroot_server.setUp()
 
92
            self.addCleanup(self._chroot_server.tearDown)
 
93
        t = get_transport(self._chroot_server.get_url())
89
94
        if relpath is not None:
90
95
            t = t.clone(relpath)
91
96
        return t
92
97
 
93
98
 
94
 
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
 
99
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
95
100
 
96
101
    def setUp(self):
97
102
        super(TestCaseWithSmartMedium, self).setUp()
99
104
        # the default or a parameterized class, but rather use the
100
105
        # TestCaseWithTransport infrastructure to set up a smart server and
101
106
        # transport.
102
 
        self.overrideAttr(self, "transport_server", self.make_transport_server)
 
107
        self.transport_server = self.make_transport_server
103
108
 
104
109
    def make_transport_server(self):
105
 
        return test_server.SmartTCPServer_for_testing('-' + self.id())
 
110
        return smart.server.SmartTCPServer_for_testing('-' + self.id())
106
111
 
107
112
    def get_smart_medium(self):
108
113
        """Get a smart medium to use in tests."""
109
114
        return self.get_transport().get_smart_medium()
110
115
 
111
116
 
112
 
class TestByteStreamToStream(tests.TestCase):
113
 
 
114
 
    def test_repeated_substreams_same_kind_are_one_stream(self):
115
 
        # Make a stream - an iterable of bytestrings.
116
 
        stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
117
 
            None, 'foo')]),('text', [
118
 
            versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
119
 
        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
120
 
        bytes = smart_repo._stream_to_byte_stream(stream, fmt)
121
 
        streams = []
122
 
        # Iterate the resulting iterable; checking that we get only one stream
123
 
        # out.
124
 
        fmt, stream = smart_repo._byte_stream_to_stream(bytes)
125
 
        for kind, substream in stream:
126
 
            streams.append((kind, list(substream)))
127
 
        self.assertLength(1, streams)
128
 
        self.assertLength(2, streams[0][1])
129
 
 
130
 
 
131
117
class TestSmartServerResponse(tests.TestCase):
132
118
 
133
119
    def test__eq__(self):
134
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
135
 
            smart_req.SmartServerResponse(('ok', )))
136
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
137
 
            smart_req.SmartServerResponse(('ok', ), 'body'))
138
 
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', )),
139
 
            smart_req.SmartServerResponse(('notok', )))
140
 
        self.assertNotEqual(smart_req.SmartServerResponse(('ok', ), 'body'),
141
 
            smart_req.SmartServerResponse(('ok', )))
 
120
        self.assertEqual(SmartServerResponse(('ok', )),
 
121
            SmartServerResponse(('ok', )))
 
122
        self.assertEqual(SmartServerResponse(('ok', ), 'body'),
 
123
            SmartServerResponse(('ok', ), 'body'))
 
124
        self.assertNotEqual(SmartServerResponse(('ok', )),
 
125
            SmartServerResponse(('notok', )))
 
126
        self.assertNotEqual(SmartServerResponse(('ok', ), 'body'),
 
127
            SmartServerResponse(('ok', )))
142
128
        self.assertNotEqual(None,
143
 
            smart_req.SmartServerResponse(('ok', )))
 
129
            SmartServerResponse(('ok', )))
144
130
 
145
131
    def test__str__(self):
146
132
        """SmartServerResponses can be stringified."""
147
133
        self.assertEqual(
148
 
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
149
 
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
 
134
            "<SmartServerResponse status=OK args=('args',) body='body'>",
 
135
            str(SuccessfulSmartServerResponse(('args',), 'body')))
150
136
        self.assertEqual(
151
 
            "<FailedSmartServerResponse args=('args',) body='body'>",
152
 
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
 
137
            "<SmartServerResponse status=ERR args=('args',) body='body'>",
 
138
            str(FailedSmartServerResponse(('args',), 'body')))
153
139
 
154
140
 
155
141
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
156
142
 
157
143
    def test_translate_client_path(self):
158
144
        transport = self.get_transport()
159
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
145
        request = SmartServerRequest(transport, 'foo/')
160
146
        self.assertEqual('./', request.translate_client_path('foo/'))
161
147
        self.assertRaises(
162
148
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
165
151
        self.assertRaises(
166
152
            errors.PathNotChild, request.translate_client_path, 'bar/')
167
153
        self.assertEqual('./baz', request.translate_client_path('foo/baz'))
168
 
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
169
 
        self.assertEqual('./' + urlutils.escape(e_acute),
170
 
                         request.translate_client_path('foo/' + e_acute))
171
 
 
172
 
    def test_translate_client_path_vfs(self):
173
 
        """VfsRequests receive escaped paths rather than raw UTF-8."""
174
 
        transport = self.get_transport()
175
 
        request = vfs.VfsRequest(transport, 'foo/')
176
 
        e_acute = u'\N{LATIN SMALL LETTER E WITH ACUTE}'.encode('utf-8')
177
 
        escaped = urlutils.escape('foo/' + e_acute)
178
 
        self.assertEqual('./' + urlutils.escape(e_acute),
179
 
                         request.translate_client_path(escaped))
180
154
 
181
155
    def test_transport_from_client_path(self):
182
156
        transport = self.get_transport()
183
 
        request = smart_req.SmartServerRequest(transport, 'foo/')
 
157
        request = SmartServerRequest(transport, 'foo/')
184
158
        self.assertEqual(
185
159
            transport.base,
186
160
            request.transport_from_client_path('foo/').base)
187
161
 
188
162
 
189
 
class TestSmartServerBzrDirRequestCloningMetaDir(
190
 
    tests.TestCaseWithMemoryTransport):
191
 
    """Tests for BzrDir.cloning_metadir."""
192
 
 
193
 
    def test_cloning_metadir(self):
194
 
        """When there is a bzrdir present, the call succeeds."""
195
 
        backing = self.get_transport()
196
 
        dir = self.make_bzrdir('.')
197
 
        local_result = dir.cloning_metadir()
198
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
199
 
        request = request_class(backing)
200
 
        expected = smart_req.SuccessfulSmartServerResponse(
201
 
            (local_result.network_name(),
202
 
            local_result.repository_format.network_name(),
203
 
            ('branch', local_result.get_branch_format().network_name())))
204
 
        self.assertEqual(expected, request.execute('', 'False'))
205
 
 
206
 
    def test_cloning_metadir_reference(self):
207
 
        """The request fails when bzrdir contains a branch reference."""
208
 
        backing = self.get_transport()
209
 
        referenced_branch = self.make_branch('referenced')
210
 
        dir = self.make_bzrdir('.')
211
 
        local_result = dir.cloning_metadir()
212
 
        reference = _mod_branch.BranchReferenceFormat().initialize(
213
 
            dir, target_branch=referenced_branch)
214
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(dir)
215
 
        # The server shouldn't try to follow the branch reference, so it's fine
216
 
        # if the referenced branch isn't reachable.
217
 
        backing.rename('referenced', 'moved')
218
 
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
219
 
        request = request_class(backing)
220
 
        expected = smart_req.FailedSmartServerResponse(('BranchReference',))
221
 
        self.assertEqual(expected, request.execute('', 'False'))
222
 
 
223
 
 
224
 
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
225
 
    """Tests for BzrDir.create_repository."""
226
 
 
227
 
    def test_makes_repository(self):
228
 
        """When there is a bzrdir present, the call succeeds."""
229
 
        backing = self.get_transport()
230
 
        self.make_bzrdir('.')
231
 
        request_class = smart_dir.SmartServerRequestCreateRepository
232
 
        request = request_class(backing)
233
 
        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
234
 
        reference_format = reference_bzrdir_format.repository_format
235
 
        network_name = reference_format.network_name()
236
 
        expected = smart_req.SuccessfulSmartServerResponse(
237
 
            ('ok', 'no', 'no', 'no', network_name))
238
 
        self.assertEqual(expected, request.execute('', network_name, 'True'))
239
 
 
240
 
 
241
163
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
242
164
    """Tests for BzrDir.find_repository."""
243
165
 
246
168
        backing = self.get_transport()
247
169
        request = self._request_class(backing)
248
170
        self.make_bzrdir('.')
249
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
171
        self.assertEqual(SmartServerResponse(('norepository', )),
250
172
            request.execute(''))
251
173
 
252
174
    def test_nonshared_repository(self):
253
 
        # nonshared repositorys only allow 'find' to return a handle when the
254
 
        # path the repository is being searched on is the same as that that
 
175
        # nonshared repositorys only allow 'find' to return a handle when the 
 
176
        # path the repository is being searched on is the same as that that 
255
177
        # the repository is at.
256
178
        backing = self.get_transport()
257
179
        request = self._request_class(backing)
258
180
        result = self._make_repository_and_result()
259
181
        self.assertEqual(result, request.execute(''))
260
182
        self.make_bzrdir('subdir')
261
 
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
 
183
        self.assertEqual(SmartServerResponse(('norepository', )),
262
184
            request.execute('subdir'))
263
185
 
264
186
    def _make_repository_and_result(self, shared=False, format=None):
275
197
            subtrees = 'yes'
276
198
        else:
277
199
            subtrees = 'no'
278
 
        if repo._format.supports_external_lookups:
279
 
            external = 'yes'
280
 
        else:
281
 
            external = 'no'
282
 
        if (smart_dir.SmartServerRequestFindRepositoryV3 ==
283
 
            self._request_class):
284
 
            return smart_req.SuccessfulSmartServerResponse(
285
 
                ('ok', '', rich_root, subtrees, external,
286
 
                 repo._format.network_name()))
287
 
        elif (smart_dir.SmartServerRequestFindRepositoryV2 ==
 
200
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
288
201
            self._request_class):
289
202
            # All tests so far are on formats, and for non-external
290
203
            # repositories.
291
 
            return smart_req.SuccessfulSmartServerResponse(
292
 
                ('ok', '', rich_root, subtrees, external))
 
204
            return SuccessfulSmartServerResponse(
 
205
                ('ok', '', rich_root, subtrees, 'no'))
293
206
        else:
294
 
            return smart_req.SuccessfulSmartServerResponse(
295
 
                ('ok', '', rich_root, subtrees))
 
207
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
296
208
 
297
209
    def test_shared_repository(self):
298
210
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
301
213
        result = self._make_repository_and_result(shared=True)
302
214
        self.assertEqual(result, request.execute(''))
303
215
        self.make_bzrdir('subdir')
304
 
        result2 = smart_req.SmartServerResponse(
305
 
            result.args[0:1] + ('..', ) + result.args[2:])
 
216
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
306
217
        self.assertEqual(result2,
307
218
            request.execute('subdir'))
308
219
        self.make_bzrdir('subdir/deeper')
309
 
        result3 = smart_req.SmartServerResponse(
310
 
            result.args[0:1] + ('../..', ) + result.args[2:])
 
220
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
311
221
        self.assertEqual(result3,
312
222
            request.execute('subdir/deeper'))
313
223
 
315
225
        """Test for the format attributes for rich root and subtree support."""
316
226
        backing = self.get_transport()
317
227
        request = self._request_class(backing)
318
 
        result = self._make_repository_and_result(
319
 
            format='dirstate-with-subtree')
 
228
        result = self._make_repository_and_result(format='dirstate-with-subtree')
320
229
        # check the test will be valid
321
230
        self.assertEqual('yes', result.args[2])
322
231
        self.assertEqual('yes', result.args[3])
326
235
        """Test for the supports_external_lookups attribute."""
327
236
        backing = self.get_transport()
328
237
        request = self._request_class(backing)
329
 
        result = self._make_repository_and_result(
330
 
            format='dirstate-with-subtree')
 
238
        result = self._make_repository_and_result(format='dirstate-with-subtree')
331
239
        # check the test will be valid
332
240
        self.assertEqual('no', result.args[4])
333
241
        self.assertEqual(result, request.execute(''))
334
242
 
335
243
 
336
 
class TestSmartServerBzrDirRequestGetConfigFile(
337
 
    tests.TestCaseWithMemoryTransport):
338
 
    """Tests for BzrDir.get_config_file."""
339
 
 
340
 
    def test_present(self):
341
 
        backing = self.get_transport()
342
 
        dir = self.make_bzrdir('.')
343
 
        dir.get_config().set_default_stack_on("/")
344
 
        local_result = dir._get_config()._get_config_file().read()
345
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
346
 
        request = request_class(backing)
347
 
        expected = smart_req.SuccessfulSmartServerResponse((), local_result)
348
 
        self.assertEqual(expected, request.execute(''))
349
 
 
350
 
    def test_missing(self):
351
 
        backing = self.get_transport()
352
 
        dir = self.make_bzrdir('.')
353
 
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
354
 
        request = request_class(backing)
355
 
        expected = smart_req.SuccessfulSmartServerResponse((), '')
356
 
        self.assertEqual(expected, request.execute(''))
357
 
 
358
 
 
359
244
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
360
245
 
361
246
    def test_empty_dir(self):
362
247
        """Initializing an empty dir should succeed and do it."""
363
248
        backing = self.get_transport()
364
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
365
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
 
249
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
250
        self.assertEqual(SmartServerResponse(('ok', )),
366
251
            request.execute(''))
367
252
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
368
 
        # no branch, tree or repository is expected with the current
 
253
        # no branch, tree or repository is expected with the current 
369
254
        # default formart.
370
255
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
371
256
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
374
259
    def test_missing_dir(self):
375
260
        """Initializing a missing directory should fail like the bzrdir api."""
376
261
        backing = self.get_transport()
377
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
262
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
378
263
        self.assertRaises(errors.NoSuchFile,
379
264
            request.execute, 'subdir')
380
265
 
381
266
    def test_initialized_dir(self):
382
267
        """Initializing an extant bzrdir should fail like the bzrdir api."""
383
268
        backing = self.get_transport()
384
 
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
269
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
385
270
        self.make_bzrdir('subdir')
386
271
        self.assertRaises(errors.FileExists,
387
272
            request.execute, 'subdir')
388
273
 
389
274
 
390
 
class TestSmartServerRequestBzrDirInitializeEx(
391
 
    tests.TestCaseWithMemoryTransport):
392
 
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
393
 
 
394
 
    The main unit tests in test_bzrdir exercise the API comprehensively.
395
 
    """
396
 
 
397
 
    def test_empty_dir(self):
398
 
        """Initializing an empty dir should succeed and do it."""
399
 
        backing = self.get_transport()
400
 
        name = self.make_bzrdir('reference')._format.network_name()
401
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
402
 
        self.assertEqual(
403
 
            smart_req.SmartServerResponse(('', '', '', '', '', '', name,
404
 
                                           'False', '', '', '')),
405
 
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
406
 
                            'False'))
407
 
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
408
 
        # no branch, tree or repository is expected with the current
409
 
        # default format.
410
 
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
411
 
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
412
 
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
413
 
 
414
 
    def test_missing_dir(self):
415
 
        """Initializing a missing directory should fail like the bzrdir api."""
416
 
        backing = self.get_transport()
417
 
        name = self.make_bzrdir('reference')._format.network_name()
418
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
419
 
        self.assertRaises(errors.NoSuchFile, request.execute, name,
420
 
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
421
 
 
422
 
    def test_initialized_dir(self):
423
 
        """Initializing an extant directory should fail like the bzrdir api."""
424
 
        backing = self.get_transport()
425
 
        name = self.make_bzrdir('reference')._format.network_name()
426
 
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
427
 
        self.make_bzrdir('subdir')
428
 
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
429
 
            'False', 'False', 'False', '', '', '', '', 'False')
430
 
 
431
 
 
432
 
class TestSmartServerRequestOpenBzrDir(tests.TestCaseWithMemoryTransport):
433
 
 
434
 
    def test_no_directory(self):
435
 
        backing = self.get_transport()
436
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
437
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
438
 
            request.execute('does-not-exist'))
439
 
 
440
 
    def test_empty_directory(self):
441
 
        backing = self.get_transport()
442
 
        backing.mkdir('empty')
443
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing)
444
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
445
 
            request.execute('empty'))
446
 
 
447
 
    def test_outside_root_client_path(self):
448
 
        backing = self.get_transport()
449
 
        request = smart_dir.SmartServerRequestOpenBzrDir(backing,
450
 
            root_client_path='root')
451
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
452
 
            request.execute('not-root'))
453
 
 
454
 
 
455
 
class TestSmartServerRequestOpenBzrDir_2_1(tests.TestCaseWithMemoryTransport):
456
 
 
457
 
    def test_no_directory(self):
458
 
        backing = self.get_transport()
459
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
460
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
461
 
            request.execute('does-not-exist'))
462
 
 
463
 
    def test_empty_directory(self):
464
 
        backing = self.get_transport()
465
 
        backing.mkdir('empty')
466
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
467
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
468
 
            request.execute('empty'))
469
 
 
470
 
    def test_present_without_workingtree(self):
471
 
        backing = self.get_transport()
472
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
473
 
        self.make_bzrdir('.')
474
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
475
 
            request.execute(''))
476
 
 
477
 
    def test_outside_root_client_path(self):
478
 
        backing = self.get_transport()
479
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing,
480
 
            root_client_path='root')
481
 
        self.assertEqual(smart_req.SmartServerResponse(('no',)),
482
 
            request.execute('not-root'))
483
 
 
484
 
 
485
 
class TestSmartServerRequestOpenBzrDir_2_1_disk(TestCaseWithChrootedTransport):
486
 
 
487
 
    def test_present_with_workingtree(self):
488
 
        self.vfs_transport_factory = test_server.LocalURLServer
489
 
        backing = self.get_transport()
490
 
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
491
 
        bd = self.make_bzrdir('.')
492
 
        bd.create_repository()
493
 
        bd.create_branch()
494
 
        bd.create_workingtree()
495
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'yes')),
496
 
            request.execute(''))
497
 
 
498
 
 
499
275
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
500
276
 
501
277
    def test_no_branch(self):
502
278
        """When there is no branch, ('nobranch', ) is returned."""
503
279
        backing = self.get_transport()
504
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
280
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
505
281
        self.make_bzrdir('.')
506
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
 
282
        self.assertEqual(SmartServerResponse(('nobranch', )),
507
283
            request.execute(''))
508
284
 
509
285
    def test_branch(self):
510
286
        """When there is a branch, 'ok' is returned."""
511
287
        backing = self.get_transport()
512
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
288
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
513
289
        self.make_branch('.')
514
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
 
290
        self.assertEqual(SmartServerResponse(('ok', '')),
515
291
            request.execute(''))
516
292
 
517
293
    def test_branch_reference(self):
518
294
        """When there is a branch reference, the reference URL is returned."""
519
 
        self.vfs_transport_factory = test_server.LocalURLServer
520
295
        backing = self.get_transport()
521
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
 
296
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
522
297
        branch = self.make_branch('branch')
523
298
        checkout = branch.create_checkout('reference',lightweight=True)
524
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
525
 
            checkout.bzrdir)
 
299
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
526
300
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
527
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
 
301
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
528
302
            request.execute('reference'))
529
303
 
530
 
    def test_notification_on_branch_from_repository(self):
531
 
        """When there is a repository, the error should return details."""
532
 
        backing = self.get_transport()
533
 
        request = smart_dir.SmartServerRequestOpenBranch(backing)
534
 
        repo = self.make_repository('.')
535
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
536
 
            request.execute(''))
537
 
 
538
 
 
539
 
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
540
 
 
541
 
    def test_no_branch(self):
542
 
        """When there is no branch, ('nobranch', ) is returned."""
543
 
        backing = self.get_transport()
544
 
        self.make_bzrdir('.')
545
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
546
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
547
 
            request.execute(''))
548
 
 
549
 
    def test_branch(self):
550
 
        """When there is a branch, 'ok' is returned."""
551
 
        backing = self.get_transport()
552
 
        expected = self.make_branch('.')._format.network_name()
553
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
554
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
555
 
                ('branch', expected)),
556
 
                         request.execute(''))
557
 
 
558
 
    def test_branch_reference(self):
559
 
        """When there is a branch reference, the reference URL is returned."""
560
 
        self.vfs_transport_factory = test_server.LocalURLServer
561
 
        backing = self.get_transport()
562
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
563
 
        branch = self.make_branch('branch')
564
 
        checkout = branch.create_checkout('reference',lightweight=True)
565
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
566
 
            checkout.bzrdir)
567
 
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
568
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
569
 
                ('ref', reference_url)),
570
 
                         request.execute('reference'))
571
 
 
572
 
    def test_stacked_branch(self):
573
 
        """Opening a stacked branch does not open the stacked-on branch."""
574
 
        trunk = self.make_branch('trunk')
575
 
        feature = self.make_branch('feature')
576
 
        feature.set_stacked_on_url(trunk.base)
577
 
        opened_branches = []
578
 
        _mod_branch.Branch.hooks.install_named_hook(
579
 
            'open', opened_branches.append, None)
580
 
        backing = self.get_transport()
581
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
582
 
        request.setup_jail()
583
 
        try:
584
 
            response = request.execute('feature')
585
 
        finally:
586
 
            request.teardown_jail()
587
 
        expected_format = feature._format.network_name()
588
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
589
 
                ('branch', expected_format)),
590
 
                         response)
591
 
        self.assertLength(1, opened_branches)
592
 
 
593
 
    def test_notification_on_branch_from_repository(self):
594
 
        """When there is a repository, the error should return details."""
595
 
        backing = self.get_transport()
596
 
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
597
 
        repo = self.make_repository('.')
598
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
599
 
            request.execute(''))
600
 
 
601
 
 
602
 
class TestSmartServerRequestOpenBranchV3(TestCaseWithChrootedTransport):
603
 
 
604
 
    def test_no_branch(self):
605
 
        """When there is no branch, ('nobranch', ) is returned."""
606
 
        backing = self.get_transport()
607
 
        self.make_bzrdir('.')
608
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
609
 
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
610
 
            request.execute(''))
611
 
 
612
 
    def test_branch(self):
613
 
        """When there is a branch, 'ok' is returned."""
614
 
        backing = self.get_transport()
615
 
        expected = self.make_branch('.')._format.network_name()
616
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
617
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
618
 
                ('branch', expected)),
619
 
                         request.execute(''))
620
 
 
621
 
    def test_branch_reference(self):
622
 
        """When there is a branch reference, the reference URL is returned."""
623
 
        self.vfs_transport_factory = test_server.LocalURLServer
624
 
        backing = self.get_transport()
625
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
626
 
        branch = self.make_branch('branch')
627
 
        checkout = branch.create_checkout('reference',lightweight=True)
628
 
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
629
 
            checkout.bzrdir)
630
 
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
631
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
632
 
                ('ref', reference_url)),
633
 
                         request.execute('reference'))
634
 
 
635
 
    def test_stacked_branch(self):
636
 
        """Opening a stacked branch does not open the stacked-on branch."""
637
 
        trunk = self.make_branch('trunk')
638
 
        feature = self.make_branch('feature')
639
 
        feature.set_stacked_on_url(trunk.base)
640
 
        opened_branches = []
641
 
        _mod_branch.Branch.hooks.install_named_hook(
642
 
            'open', opened_branches.append, None)
643
 
        backing = self.get_transport()
644
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
645
 
        request.setup_jail()
646
 
        try:
647
 
            response = request.execute('feature')
648
 
        finally:
649
 
            request.teardown_jail()
650
 
        expected_format = feature._format.network_name()
651
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(
652
 
                ('branch', expected_format)),
653
 
                         response)
654
 
        self.assertLength(1, opened_branches)
655
 
 
656
 
    def test_notification_on_branch_from_repository(self):
657
 
        """When there is a repository, the error should return details."""
658
 
        backing = self.get_transport()
659
 
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
660
 
        repo = self.make_repository('.')
661
 
        self.assertEqual(smart_req.SmartServerResponse(
662
 
                ('nobranch', 'location is a repository')),
663
 
                         request.execute(''))
664
 
 
665
304
 
666
305
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
667
306
 
668
307
    def test_empty(self):
669
308
        """For an empty branch, the body is empty."""
670
309
        backing = self.get_transport()
671
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
310
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
672
311
        self.make_branch('.')
673
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
 
312
        self.assertEqual(SmartServerResponse(('ok', ), ''),
674
313
            request.execute(''))
675
314
 
676
315
    def test_not_empty(self):
677
316
        """For a non-empty branch, the body is empty."""
678
317
        backing = self.get_transport()
679
 
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
 
318
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
680
319
        tree = self.make_branch_and_memory_tree('.')
681
320
        tree.lock_write()
682
321
        tree.add('')
684
323
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
685
324
        tree.unlock()
686
325
        self.assertEqual(
687
 
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
326
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
688
327
            request.execute(''))
689
328
 
690
329
 
693
332
    def test_no_branch(self):
694
333
        """When there is a bzrdir and no branch, NotBranchError is raised."""
695
334
        backing = self.get_transport()
696
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
335
        request = smart.branch.SmartServerBranchRequest(backing)
697
336
        self.make_bzrdir('.')
698
337
        self.assertRaises(errors.NotBranchError,
699
338
            request.execute, '')
701
340
    def test_branch_reference(self):
702
341
        """When there is a branch reference, NotBranchError is raised."""
703
342
        backing = self.get_transport()
704
 
        request = smart_branch.SmartServerBranchRequest(backing)
 
343
        request = smart.branch.SmartServerBranchRequest(backing)
705
344
        branch = self.make_branch('branch')
706
345
        checkout = branch.create_checkout('reference',lightweight=True)
707
346
        self.assertRaises(errors.NotBranchError,
708
347
            request.execute, 'checkout')
709
348
 
710
349
 
711
 
class TestSmartServerBranchRequestLastRevisionInfo(
712
 
    tests.TestCaseWithMemoryTransport):
 
350
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
713
351
 
714
352
    def test_empty(self):
715
353
        """For an empty branch, the result is ('ok', '0', 'null:')."""
716
354
        backing = self.get_transport()
717
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
355
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
718
356
        self.make_branch('.')
719
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
 
357
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
720
358
            request.execute(''))
721
359
 
722
360
    def test_not_empty(self):
723
361
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
724
362
        backing = self.get_transport()
725
 
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
363
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
726
364
        tree = self.make_branch_and_memory_tree('.')
727
365
        tree.lock_write()
728
366
        tree.add('')
731
369
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
732
370
        tree.unlock()
733
371
        self.assertEqual(
734
 
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
 
372
            SmartServerResponse(('ok', '2', rev_id_utf8)),
735
373
            request.execute(''))
736
374
 
737
375
 
738
 
class TestSmartServerBranchRequestGetConfigFile(
739
 
    tests.TestCaseWithMemoryTransport):
 
376
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
740
377
 
741
378
    def test_default(self):
742
379
        """With no file, we get empty content."""
743
380
        backing = self.get_transport()
744
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
381
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
745
382
        branch = self.make_branch('.')
746
383
        # there should be no file by default
747
384
        content = ''
748
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
 
385
        self.assertEqual(SmartServerResponse(('ok', ), content),
749
386
            request.execute(''))
750
387
 
751
388
    def test_with_content(self):
752
389
        # SmartServerBranchGetConfigFile should return the content from
753
390
        # branch.control_files.get('branch.conf') for now - in the future it may
754
 
        # perform more complex processing.
 
391
        # perform more complex processing. 
755
392
        backing = self.get_transport()
756
 
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
 
393
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
757
394
        branch = self.make_branch('.')
758
395
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
759
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
 
396
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
760
397
            request.execute(''))
761
398
 
762
399
 
763
 
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
764
 
 
765
 
    def get_lock_tokens(self, branch):
766
 
        branch_token = branch.lock_write().branch_token
767
 
        repo_token = branch.repository.lock_write().repository_token
768
 
        branch.repository.unlock()
769
 
        return branch_token, repo_token
770
 
 
771
 
 
772
 
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
773
 
 
774
 
    def test_value_name(self):
775
 
        branch = self.make_branch('.')
776
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
777
 
            branch.bzrdir.root_transport)
778
 
        branch_token, repo_token = self.get_lock_tokens(branch)
779
 
        config = branch._get_config()
780
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
781
 
            '')
782
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
783
 
        self.assertEqual('bar', config.get_option('foo'))
784
 
        # Cleanup
785
 
        branch.unlock()
786
 
 
787
 
    def test_value_name_section(self):
788
 
        branch = self.make_branch('.')
789
 
        request = smart_branch.SmartServerBranchRequestSetConfigOption(
790
 
            branch.bzrdir.root_transport)
791
 
        branch_token, repo_token = self.get_lock_tokens(branch)
792
 
        config = branch._get_config()
793
 
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
794
 
            'gam')
795
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
796
 
        self.assertEqual('bar', config.get_option('foo', 'gam'))
797
 
        # Cleanup
798
 
        branch.unlock()
799
 
 
800
 
 
801
 
class TestSmartServerBranchRequestSetConfigOptionDict(TestLockedBranch):
802
 
 
803
 
    def setUp(self):
804
 
        TestLockedBranch.setUp(self)
805
 
        # A dict with non-ascii keys and values to exercise unicode
806
 
        # roundtripping.
807
 
        self.encoded_value_dict = (
808
 
            'd5:ascii1:a11:unicode \xe2\x8c\x9a3:\xe2\x80\xbde')
809
 
        self.value_dict = {
810
 
            'ascii': 'a', u'unicode \N{WATCH}': u'\N{INTERROBANG}'}
811
 
 
812
 
    def test_value_name(self):
813
 
        branch = self.make_branch('.')
814
 
        request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
815
 
            branch.bzrdir.root_transport)
816
 
        branch_token, repo_token = self.get_lock_tokens(branch)
817
 
        config = branch._get_config()
818
 
        result = request.execute('', branch_token, repo_token,
819
 
            self.encoded_value_dict, 'foo', '')
820
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
821
 
        self.assertEqual(self.value_dict, config.get_option('foo'))
822
 
        # Cleanup
823
 
        branch.unlock()
824
 
 
825
 
    def test_value_name_section(self):
826
 
        branch = self.make_branch('.')
827
 
        request = smart_branch.SmartServerBranchRequestSetConfigOptionDict(
828
 
            branch.bzrdir.root_transport)
829
 
        branch_token, repo_token = self.get_lock_tokens(branch)
830
 
        config = branch._get_config()
831
 
        result = request.execute('', branch_token, repo_token,
832
 
            self.encoded_value_dict, 'foo', 'gam')
833
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), result)
834
 
        self.assertEqual(self.value_dict, config.get_option('foo', 'gam'))
835
 
        # Cleanup
836
 
        branch.unlock()
837
 
 
838
 
 
839
 
class TestSmartServerBranchRequestSetTagsBytes(TestLockedBranch):
840
 
    # Only called when the branch format and tags match [yay factory
841
 
    # methods] so only need to test straight forward cases.
842
 
 
843
 
    def test_set_bytes(self):
844
 
        base_branch = self.make_branch('base')
845
 
        tag_bytes = base_branch._get_tags_bytes()
846
 
        # get_lock_tokens takes out a lock.
847
 
        branch_token, repo_token = self.get_lock_tokens(base_branch)
848
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
849
 
            self.get_transport())
850
 
        response = request.execute('base', branch_token, repo_token)
851
 
        self.assertEqual(None, response)
852
 
        response = request.do_chunk(tag_bytes)
853
 
        self.assertEqual(None, response)
854
 
        response = request.do_end()
855
 
        self.assertEquals(
856
 
            smart_req.SuccessfulSmartServerResponse(()), response)
857
 
        base_branch.unlock()
858
 
 
859
 
    def test_lock_failed(self):
860
 
        base_branch = self.make_branch('base')
861
 
        base_branch.lock_write()
862
 
        tag_bytes = base_branch._get_tags_bytes()
863
 
        request = smart_branch.SmartServerBranchSetTagsBytes(
864
 
            self.get_transport())
865
 
        self.assertRaises(errors.TokenMismatch, request.execute,
866
 
            'base', 'wrong token', 'wrong token')
867
 
        # The request handler will keep processing the message parts, so even
868
 
        # if the request fails immediately do_chunk and do_end are still
869
 
        # called.
870
 
        request.do_chunk(tag_bytes)
871
 
        request.do_end()
872
 
        base_branch.unlock()
873
 
 
874
 
 
875
 
 
876
 
class SetLastRevisionTestBase(TestLockedBranch):
 
400
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
877
401
    """Base test case for verbs that implement set_last_revision."""
878
402
 
879
403
    def setUp(self):
883
407
        self.tree = self.make_branch_and_memory_tree('.')
884
408
 
885
409
    def lock_branch(self):
886
 
        return self.get_lock_tokens(self.tree.branch)
 
410
        b = self.tree.branch
 
411
        branch_token = b.lock_write()
 
412
        repo_token = b.repository.lock_write()
 
413
        b.repository.unlock()
 
414
        return branch_token, repo_token
887
415
 
888
416
    def unlock_branch(self):
889
417
        self.tree.branch.unlock()
890
 
 
 
418
        
891
419
    def set_last_revision(self, revision_id, revno):
892
420
        branch_token, repo_token = self.lock_branch()
893
421
        response = self._set_last_revision(
897
425
 
898
426
    def assertRequestSucceeds(self, revision_id, revno):
899
427
        response = self.set_last_revision(revision_id, revno)
900
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
901
 
                         response)
902
 
 
903
 
 
 
428
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
 
429
 
 
430
        
904
431
class TestSetLastRevisionVerbMixin(object):
905
432
    """Mixin test case for verbs that implement set_last_revision."""
906
433
 
912
439
        """If the revision_id is not present, the verb returns NoSuchRevision.
913
440
        """
914
441
        revision_id = 'non-existent revision'
915
 
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
916
 
                                                              revision_id)),
917
 
                         self.set_last_revision(revision_id, 1))
 
442
        self.assertEqual(
 
443
            FailedSmartServerResponse(('NoSuchRevision', revision_id)),
 
444
            self.set_last_revision(revision_id, 1))
918
445
 
919
446
    def make_tree_with_two_commits(self):
920
447
        self.tree.lock_write()
932
459
        # its repository.
933
460
        self.make_tree_with_two_commits()
934
461
        rev_id_utf8 = u'\xc8'.encode('utf-8')
935
 
        self.tree.branch.set_last_revision_info(0, 'null:')
 
462
        self.tree.branch.set_revision_history([])
936
463
        self.assertEqual(
937
464
            (0, 'null:'), self.tree.branch.last_revision_info())
938
465
        # We can update the branch to a revision that is present in the
960
487
        rejection_message = u'rejection message\N{INTERROBANG}'
961
488
        def hook_that_rejects(params):
962
489
            raise errors.TipChangeRejected(rejection_message)
963
 
        _mod_branch.Branch.hooks.install_named_hook(
 
490
        Branch.hooks.install_named_hook(
964
491
            'pre_change_branch_tip', hook_that_rejects, None)
965
492
        self.assertEqual(
966
 
            smart_req.FailedSmartServerResponse(
 
493
            FailedSmartServerResponse(
967
494
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
968
495
            self.set_last_revision('null:', 0))
969
496
 
972
499
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
973
500
    """Tests for Branch.set_last_revision verb."""
974
501
 
975
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
 
502
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
976
503
 
977
504
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
978
505
        return self.request.execute(
983
510
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
984
511
    """Tests for Branch.set_last_revision_info verb."""
985
512
 
986
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
 
513
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionInfo
987
514
 
988
515
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
989
516
        return self.request.execute(
1000
527
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
1001
528
    """Tests for Branch.set_last_revision_ex verb."""
1002
529
 
1003
 
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
 
530
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
1004
531
 
1005
532
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
1006
533
        return self.request.execute(
1009
536
    def assertRequestSucceeds(self, revision_id, revno):
1010
537
        response = self.set_last_revision(revision_id, revno)
1011
538
        self.assertEqual(
1012
 
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
 
539
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
1013
540
            response)
1014
 
 
 
541
        
1015
542
    def test_branch_last_revision_info_rewind(self):
1016
543
        """A branch's tip can be set to a revision that is an ancestor of the
1017
544
        current tip, but only if allow_overwrite_descendant is passed.
1026
553
        response = self.request.execute(
1027
554
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
1028
555
        self.assertEqual(
1029
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
 
556
            SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
1030
557
            response)
1031
558
        self.assertEqual(
1032
559
            (2, 'rev-2'), self.tree.branch.last_revision_info())
1036
563
        response = self.request.execute(
1037
564
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
1038
565
        self.assertEqual(
1039
 
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
 
566
            SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
1040
567
            response)
1041
568
        self.unlock_branch()
1042
569
        self.assertEqual(
1060
587
        # child-1.
1061
588
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
1062
589
        self.tree.unlock()
1063
 
 
 
590
        
1064
591
    def test_not_allow_diverged(self):
1065
592
        """If allow_diverged is not passed, then setting a divergent history
1066
593
        returns a Diverged error.
1067
594
        """
1068
595
        self.make_branch_with_divergent_history()
1069
596
        self.assertEqual(
1070
 
            smart_req.FailedSmartServerResponse(('Diverged',)),
 
597
            FailedSmartServerResponse(('Diverged',)),
1071
598
            self.set_last_revision('child-1', 2))
1072
599
        # The branch tip was not changed.
1073
600
        self.assertEqual('child-2', self.tree.branch.last_revision())
1081
608
        response = self.request.execute(
1082
609
            '', branch_token, repo_token, 'child-1', 1, 0)
1083
610
        self.assertEqual(
1084
 
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
 
611
            SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
1085
612
            response)
1086
613
        self.unlock_branch()
1087
614
        # The branch tip was changed.
1088
615
        self.assertEqual('child-1', self.tree.branch.last_revision())
1089
616
 
1090
617
 
1091
 
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
1092
 
 
1093
 
    def test_get_parent_none(self):
1094
 
        base_branch = self.make_branch('base')
1095
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1096
 
        response = request.execute('base')
1097
 
        self.assertEquals(
1098
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1099
 
 
1100
 
    def test_get_parent_something(self):
1101
 
        base_branch = self.make_branch('base')
1102
 
        base_branch.set_parent(self.get_url('foo'))
1103
 
        request = smart_branch.SmartServerBranchGetParent(self.get_transport())
1104
 
        response = request.execute('base')
1105
 
        self.assertEquals(
1106
 
            smart_req.SuccessfulSmartServerResponse(("../foo",)),
1107
 
            response)
1108
 
 
1109
 
 
1110
 
class TestSmartServerBranchRequestSetParent(TestLockedBranch):
1111
 
 
1112
 
    def test_set_parent_none(self):
1113
 
        branch = self.make_branch('base', format="1.9")
1114
 
        branch.lock_write()
1115
 
        branch._set_parent_location('foo')
1116
 
        branch.unlock()
1117
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1118
 
            self.get_transport())
1119
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1120
 
        try:
1121
 
            response = request.execute('base', branch_token, repo_token, '')
1122
 
        finally:
1123
 
            branch.unlock()
1124
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1125
 
        self.assertEqual(None, branch.get_parent())
1126
 
 
1127
 
    def test_set_parent_something(self):
1128
 
        branch = self.make_branch('base', format="1.9")
1129
 
        request = smart_branch.SmartServerBranchRequestSetParentLocation(
1130
 
            self.get_transport())
1131
 
        branch_token, repo_token = self.get_lock_tokens(branch)
1132
 
        try:
1133
 
            response = request.execute('base', branch_token, repo_token,
1134
 
            'http://bar/')
1135
 
        finally:
1136
 
            branch.unlock()
1137
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(()), response)
1138
 
        self.assertEqual('http://bar/', branch.get_parent())
1139
 
 
1140
 
 
1141
 
class TestSmartServerBranchRequestGetTagsBytes(
1142
 
    tests.TestCaseWithMemoryTransport):
1143
 
    # Only called when the branch format and tags match [yay factory
1144
 
    # methods] so only need to test straight forward cases.
1145
 
 
1146
 
    def test_get_bytes(self):
1147
 
        base_branch = self.make_branch('base')
1148
 
        request = smart_branch.SmartServerBranchGetTagsBytes(
1149
 
            self.get_transport())
1150
 
        response = request.execute('base')
1151
 
        self.assertEquals(
1152
 
            smart_req.SuccessfulSmartServerResponse(('',)), response)
1153
 
 
1154
 
 
1155
 
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
1156
 
 
1157
 
    def test_get_stacked_on_url(self):
1158
 
        base_branch = self.make_branch('base', format='1.6')
1159
 
        stacked_branch = self.make_branch('stacked', format='1.6')
1160
 
        # typically should be relative
1161
 
        stacked_branch.set_stacked_on_url('../base')
1162
 
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
1163
 
            self.get_transport())
1164
 
        response = request.execute('stacked')
1165
 
        self.assertEquals(
1166
 
            smart_req.SmartServerResponse(('ok', '../base')),
1167
 
            response)
1168
 
 
1169
 
 
1170
 
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
 
618
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
1171
619
 
1172
620
    def setUp(self):
1173
621
        tests.TestCaseWithMemoryTransport.setUp(self)
1174
622
 
1175
623
    def test_lock_write_on_unlocked_branch(self):
1176
624
        backing = self.get_transport()
1177
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
625
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1178
626
        branch = self.make_branch('.', format='knit')
1179
627
        repository = branch.repository
1180
628
        response = request.execute('')
1181
629
        branch_nonce = branch.control_files._lock.peek().get('nonce')
1182
630
        repository_nonce = repository.control_files._lock.peek().get('nonce')
1183
 
        self.assertEqual(smart_req.SmartServerResponse(
1184
 
                ('ok', branch_nonce, repository_nonce)),
1185
 
                         response)
 
631
        self.assertEqual(
 
632
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
 
633
            response)
1186
634
        # The branch (and associated repository) is now locked.  Verify that
1187
635
        # with a new branch object.
1188
636
        new_branch = repository.bzrdir.open_branch()
1189
637
        self.assertRaises(errors.LockContention, new_branch.lock_write)
1190
 
        # Cleanup
1191
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
1192
 
        response = request.execute('', branch_nonce, repository_nonce)
1193
638
 
1194
639
    def test_lock_write_on_locked_branch(self):
1195
640
        backing = self.get_transport()
1196
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
641
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1197
642
        branch = self.make_branch('.')
1198
 
        branch_token = branch.lock_write().branch_token
 
643
        branch.lock_write()
1199
644
        branch.leave_lock_in_place()
1200
645
        branch.unlock()
1201
646
        response = request.execute('')
1202
647
        self.assertEqual(
1203
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1204
 
        # Cleanup
1205
 
        branch.lock_write(branch_token)
1206
 
        branch.dont_leave_lock_in_place()
1207
 
        branch.unlock()
 
648
            SmartServerResponse(('LockContention',)), response)
1208
649
 
1209
650
    def test_lock_write_with_tokens_on_locked_branch(self):
1210
651
        backing = self.get_transport()
1211
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
652
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1212
653
        branch = self.make_branch('.', format='knit')
1213
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
654
        branch_token = branch.lock_write()
 
655
        repo_token = branch.repository.lock_write()
 
656
        branch.repository.unlock()
1214
657
        branch.leave_lock_in_place()
1215
658
        branch.repository.leave_lock_in_place()
1216
659
        branch.unlock()
1217
660
        response = request.execute('',
1218
661
                                   branch_token, repo_token)
1219
662
        self.assertEqual(
1220
 
            smart_req.SmartServerResponse(('ok', branch_token, repo_token)),
1221
 
            response)
1222
 
        # Cleanup
1223
 
        branch.repository.lock_write(repo_token)
1224
 
        branch.repository.dont_leave_lock_in_place()
1225
 
        branch.repository.unlock()
1226
 
        branch.lock_write(branch_token)
1227
 
        branch.dont_leave_lock_in_place()
1228
 
        branch.unlock()
 
663
            SmartServerResponse(('ok', branch_token, repo_token)), response)
1229
664
 
1230
665
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
1231
666
        backing = self.get_transport()
1232
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
667
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1233
668
        branch = self.make_branch('.', format='knit')
1234
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
669
        branch_token = branch.lock_write()
 
670
        repo_token = branch.repository.lock_write()
 
671
        branch.repository.unlock()
1235
672
        branch.leave_lock_in_place()
1236
673
        branch.repository.leave_lock_in_place()
1237
674
        branch.unlock()
1238
675
        response = request.execute('',
1239
676
                                   branch_token+'xxx', repo_token)
1240
677
        self.assertEqual(
1241
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1242
 
        # Cleanup
1243
 
        branch.repository.lock_write(repo_token)
1244
 
        branch.repository.dont_leave_lock_in_place()
1245
 
        branch.repository.unlock()
1246
 
        branch.lock_write(branch_token)
1247
 
        branch.dont_leave_lock_in_place()
1248
 
        branch.unlock()
 
678
            SmartServerResponse(('TokenMismatch',)), response)
1249
679
 
1250
680
    def test_lock_write_on_locked_repo(self):
1251
681
        backing = self.get_transport()
1252
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
682
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1253
683
        branch = self.make_branch('.', format='knit')
1254
 
        repo = branch.repository
1255
 
        repo_token = repo.lock_write().repository_token
1256
 
        repo.leave_lock_in_place()
1257
 
        repo.unlock()
 
684
        branch.repository.lock_write()
 
685
        branch.repository.leave_lock_in_place()
 
686
        branch.repository.unlock()
1258
687
        response = request.execute('')
1259
688
        self.assertEqual(
1260
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1261
 
        # Cleanup
1262
 
        repo.lock_write(repo_token)
1263
 
        repo.dont_leave_lock_in_place()
1264
 
        repo.unlock()
 
689
            SmartServerResponse(('LockContention',)), response)
1265
690
 
1266
691
    def test_lock_write_on_readonly_transport(self):
1267
692
        backing = self.get_readonly_transport()
1268
 
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
 
693
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
1269
694
        branch = self.make_branch('.')
1270
695
        root = self.get_transport().clone('/')
1271
696
        path = urlutils.relative_url(root.base, self.get_transport().base)
1275
700
        self.assertEqual('LockFailed', error_name)
1276
701
 
1277
702
 
1278
 
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
 
703
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
1279
704
 
1280
705
    def setUp(self):
1281
706
        tests.TestCaseWithMemoryTransport.setUp(self)
1282
707
 
1283
708
    def test_unlock_on_locked_branch_and_repo(self):
1284
709
        backing = self.get_transport()
1285
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
710
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1286
711
        branch = self.make_branch('.', format='knit')
1287
712
        # Lock the branch
1288
 
        branch_token, repo_token = self.get_lock_tokens(branch)
 
713
        branch_token = branch.lock_write()
 
714
        repo_token = branch.repository.lock_write()
 
715
        branch.repository.unlock()
1289
716
        # Unlock the branch (and repo) object, leaving the physical locks
1290
717
        # in place.
1291
718
        branch.leave_lock_in_place()
1294
721
        response = request.execute('',
1295
722
                                   branch_token, repo_token)
1296
723
        self.assertEqual(
1297
 
            smart_req.SmartServerResponse(('ok',)), response)
 
724
            SmartServerResponse(('ok',)), response)
1298
725
        # The branch is now unlocked.  Verify that with a new branch
1299
726
        # object.
1300
727
        new_branch = branch.bzrdir.open_branch()
1303
730
 
1304
731
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
1305
732
        backing = self.get_transport()
1306
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
733
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1307
734
        branch = self.make_branch('.', format='knit')
1308
735
        response = request.execute(
1309
736
            '', 'branch token', 'repo token')
1310
737
        self.assertEqual(
1311
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
738
            SmartServerResponse(('TokenMismatch',)), response)
1312
739
 
1313
740
    def test_unlock_on_unlocked_branch_locked_repo(self):
1314
741
        backing = self.get_transport()
1315
 
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
742
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
1316
743
        branch = self.make_branch('.', format='knit')
1317
744
        # Lock the repository.
1318
 
        repo_token = branch.repository.lock_write().repository_token
 
745
        repo_token = branch.repository.lock_write()
1319
746
        branch.repository.leave_lock_in_place()
1320
747
        branch.repository.unlock()
1321
748
        # Issue branch lock_write request on the unlocked branch (with locked
1322
749
        # repo).
1323
 
        response = request.execute('', 'branch token', repo_token)
 
750
        response = request.execute(
 
751
            '', 'branch token', repo_token)
1324
752
        self.assertEqual(
1325
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1326
 
        # Cleanup
1327
 
        branch.repository.lock_write(repo_token)
1328
 
        branch.repository.dont_leave_lock_in_place()
1329
 
        branch.repository.unlock()
 
753
            SmartServerResponse(('TokenMismatch',)), response)
1330
754
 
1331
755
 
1332
756
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
1338
762
        # its the exact path being looked at and the server is not
1339
763
        # searching.
1340
764
        backing = self.get_transport()
1341
 
        request = smart_repo.SmartServerRepositoryRequest(backing)
 
765
        request = smart.repository.SmartServerRepositoryRequest(backing)
1342
766
        self.make_repository('.', shared=True)
1343
767
        self.make_bzrdir('subdir')
1344
768
        self.assertRaises(errors.NoRepositoryPresent,
1350
774
    def test_trivial_bzipped(self):
1351
775
        # This tests that the wire encoding is actually bzipped
1352
776
        backing = self.get_transport()
1353
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
 
777
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
1354
778
        tree = self.make_branch_and_memory_tree('.')
1355
779
 
1356
780
        self.assertEqual(None,
1357
781
            request.execute('', 'missing-id'))
1358
 
        # Note that it returns a body that is bzipped.
1359
 
        self.assertEqual(
1360
 
            smart_req.SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
1361
 
            request.do_body('\n\n0\n'))
1362
 
 
1363
 
    def test_trivial_include_missing(self):
1364
 
        backing = self.get_transport()
1365
 
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
1366
 
        tree = self.make_branch_and_memory_tree('.')
1367
 
 
1368
 
        self.assertEqual(None,
1369
 
            request.execute('', 'missing-id', 'include-missing:'))
1370
 
        self.assertEqual(
1371
 
            smart_req.SuccessfulSmartServerResponse(('ok', ),
1372
 
                bz2.compress('missing:missing-id')),
1373
 
            request.do_body('\n\n0\n'))
1374
 
 
1375
 
 
1376
 
class TestSmartServerRepositoryGetRevisionGraph(
1377
 
    tests.TestCaseWithMemoryTransport):
 
782
        # Note that it returns a body (of '' bzipped).
 
783
        self.assertEqual(
 
784
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
 
785
            request.do_body('\n\n0\n'))
 
786
 
 
787
 
 
788
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
1378
789
 
1379
790
    def test_none_argument(self):
1380
791
        backing = self.get_transport()
1381
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
792
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1382
793
        tree = self.make_branch_and_memory_tree('.')
1383
794
        tree.lock_write()
1384
795
        tree.add('')
1393
804
        response.body = '\n'.join(sorted(response.body.split('\n')))
1394
805
 
1395
806
        self.assertEqual(
1396
 
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
807
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
1397
808
 
1398
809
    def test_specific_revision_argument(self):
1399
810
        backing = self.get_transport()
1400
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
811
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1401
812
        tree = self.make_branch_and_memory_tree('.')
1402
813
        tree.lock_write()
1403
814
        tree.add('')
1406
817
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1407
818
        tree.unlock()
1408
819
 
1409
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
 
820
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
1410
821
            request.execute('', rev_id_utf8))
1411
 
 
 
822
    
1412
823
    def test_no_such_revision(self):
1413
824
        backing = self.get_transport()
1414
 
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
 
825
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
1415
826
        tree = self.make_branch_and_memory_tree('.')
1416
827
        tree.lock_write()
1417
828
        tree.add('')
1419
830
        tree.unlock()
1420
831
 
1421
832
        # Note that it still returns body (of zero bytes).
1422
 
        self.assertEqual(smart_req.SmartServerResponse(
1423
 
                ('nosuchrevision', 'missingrevision', ), ''),
1424
 
                         request.execute('', 'missingrevision'))
1425
 
 
1426
 
 
1427
 
class TestSmartServerRepositoryGetRevIdForRevno(
1428
 
    tests.TestCaseWithMemoryTransport):
1429
 
 
1430
 
    def test_revno_found(self):
1431
 
        backing = self.get_transport()
1432
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1433
 
        tree = self.make_branch_and_memory_tree('.')
1434
 
        tree.lock_write()
1435
 
        tree.add('')
1436
 
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
1437
 
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
1438
 
        tree.commit('1st commit', rev_id=rev1_id_utf8)
1439
 
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
1440
 
        tree.unlock()
1441
 
 
1442
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', rev1_id_utf8)),
1443
 
            request.execute('', 1, (2, rev2_id_utf8)))
1444
 
 
1445
 
    def test_known_revid_missing(self):
1446
 
        backing = self.get_transport()
1447
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1448
 
        repo = self.make_repository('.')
1449
 
        self.assertEqual(
1450
 
            smart_req.FailedSmartServerResponse(('nosuchrevision', 'ghost')),
1451
 
            request.execute('', 1, (2, 'ghost')))
1452
 
 
1453
 
    def test_history_incomplete(self):
1454
 
        backing = self.get_transport()
1455
 
        request = smart_repo.SmartServerRepositoryGetRevIdForRevno(backing)
1456
 
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
1457
 
        parent.lock_write()
1458
 
        parent.add([''], ['TREE_ROOT'])
1459
 
        r1 = parent.commit(message='first commit')
1460
 
        r2 = parent.commit(message='second commit')
1461
 
        parent.unlock()
1462
 
        local = self.make_branch_and_memory_tree('local', format='1.9')
1463
 
        local.branch.pull(parent.branch)
1464
 
        local.set_parent_ids([r2])
1465
 
        r3 = local.commit(message='local commit')
1466
 
        local.branch.create_clone_on_transport(
1467
 
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
1468
 
        self.assertEqual(
1469
 
            smart_req.SmartServerResponse(('history-incomplete', 2, r2)),
1470
 
            request.execute('stacked', 1, (3, r3)))
1471
 
 
1472
 
 
1473
 
class GetStreamTestBase(tests.TestCaseWithMemoryTransport):
1474
 
 
1475
 
    def make_two_commit_repo(self):
1476
 
        tree = self.make_branch_and_memory_tree('.')
1477
 
        tree.lock_write()
1478
 
        tree.add('')
1479
 
        r1 = tree.commit('1st commit')
1480
 
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
1481
 
        tree.unlock()
1482
 
        repo = tree.branch.repository
1483
 
        return repo, r1, r2
1484
 
 
1485
 
 
1486
 
class TestSmartServerRepositoryGetStream(GetStreamTestBase):
1487
 
 
1488
 
    def test_ancestry_of(self):
1489
 
        """The search argument may be a 'ancestry-of' some heads'."""
1490
 
        backing = self.get_transport()
1491
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1492
 
        repo, r1, r2 = self.make_two_commit_repo()
1493
 
        fetch_spec = ['ancestry-of', r2]
1494
 
        lines = '\n'.join(fetch_spec)
1495
 
        request.execute('', repo._format.network_name())
1496
 
        response = request.do_body(lines)
1497
 
        self.assertEqual(('ok',), response.args)
1498
 
        stream_bytes = ''.join(response.body_stream)
1499
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1500
 
 
1501
 
    def test_search(self):
1502
 
        """The search argument may be a 'search' of some explicit keys."""
1503
 
        backing = self.get_transport()
1504
 
        request = smart_repo.SmartServerRepositoryGetStream(backing)
1505
 
        repo, r1, r2 = self.make_two_commit_repo()
1506
 
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
1507
 
        lines = '\n'.join(fetch_spec)
1508
 
        request.execute('', repo._format.network_name())
1509
 
        response = request.do_body(lines)
1510
 
        self.assertEqual(('ok',), response.args)
1511
 
        stream_bytes = ''.join(response.body_stream)
1512
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
1513
 
 
1514
 
    def test_search_everything(self):
1515
 
        """A search of 'everything' returns a stream."""
1516
 
        backing = self.get_transport()
1517
 
        request = smart_repo.SmartServerRepositoryGetStream_1_19(backing)
1518
 
        repo, r1, r2 = self.make_two_commit_repo()
1519
 
        serialised_fetch_spec = 'everything'
1520
 
        request.execute('', repo._format.network_name())
1521
 
        response = request.do_body(serialised_fetch_spec)
1522
 
        self.assertEqual(('ok',), response.args)
1523
 
        stream_bytes = ''.join(response.body_stream)
1524
 
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
833
        self.assertEqual(
 
834
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
 
835
            request.execute('', 'missingrevision'))
1525
836
 
1526
837
 
1527
838
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
1529
840
    def test_missing_revision(self):
1530
841
        """For a missing revision, ('no', ) is returned."""
1531
842
        backing = self.get_transport()
1532
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
843
        request = smart.repository.SmartServerRequestHasRevision(backing)
1533
844
        self.make_repository('.')
1534
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
845
        self.assertEqual(SmartServerResponse(('no', )),
1535
846
            request.execute('', 'revid'))
1536
847
 
1537
848
    def test_present_revision(self):
1538
849
        """For a present revision, ('yes', ) is returned."""
1539
850
        backing = self.get_transport()
1540
 
        request = smart_repo.SmartServerRequestHasRevision(backing)
 
851
        request = smart.repository.SmartServerRequestHasRevision(backing)
1541
852
        tree = self.make_branch_and_memory_tree('.')
1542
853
        tree.lock_write()
1543
854
        tree.add('')
1545
856
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
1546
857
        tree.unlock()
1547
858
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
1548
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
859
        self.assertEqual(SmartServerResponse(('yes', )),
1549
860
            request.execute('', rev_id_utf8))
1550
861
 
1551
862
 
1554
865
    def test_empty_revid(self):
1555
866
        """With an empty revid, we get only size an number and revisions"""
1556
867
        backing = self.get_transport()
1557
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
868
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1558
869
        repository = self.make_repository('.')
1559
870
        stats = repository.gather_stats()
1560
871
        expected_body = 'revisions: 0\n'
1561
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
872
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1562
873
                         request.execute('', '', 'no'))
1563
874
 
1564
875
    def test_revid_with_committers(self):
1565
876
        """For a revid we get more infos."""
1566
877
        backing = self.get_transport()
1567
878
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1568
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
879
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1569
880
        tree = self.make_branch_and_memory_tree('.')
1570
881
        tree.lock_write()
1571
882
        tree.add('')
1579
890
        expected_body = ('firstrev: 123456.200 3600\n'
1580
891
                         'latestrev: 654321.400 0\n'
1581
892
                         'revisions: 2\n')
1582
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
893
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1583
894
                         request.execute('',
1584
895
                                         rev_id_utf8, 'no'))
1585
896
 
1587
898
        """For a revid and requesting committers we get the whole thing."""
1588
899
        backing = self.get_transport()
1589
900
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
1590
 
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
 
901
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
1591
902
        tree = self.make_branch_and_memory_tree('.')
1592
903
        tree.lock_write()
1593
904
        tree.add('')
1603
914
                         'firstrev: 123456.200 3600\n'
1604
915
                         'latestrev: 654321.400 0\n'
1605
916
                         'revisions: 2\n')
1606
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
 
917
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
1607
918
                         request.execute('',
1608
919
                                         rev_id_utf8, 'yes'))
1609
920
 
1613
924
    def test_is_shared(self):
1614
925
        """For a shared repository, ('yes', ) is returned."""
1615
926
        backing = self.get_transport()
1616
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
927
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1617
928
        self.make_repository('.', shared=True)
1618
 
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
 
929
        self.assertEqual(SmartServerResponse(('yes', )),
1619
930
            request.execute('', ))
1620
931
 
1621
932
    def test_is_not_shared(self):
1622
933
        """For a shared repository, ('no', ) is returned."""
1623
934
        backing = self.get_transport()
1624
 
        request = smart_repo.SmartServerRepositoryIsShared(backing)
 
935
        request = smart.repository.SmartServerRepositoryIsShared(backing)
1625
936
        self.make_repository('.', shared=False)
1626
 
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
 
937
        self.assertEqual(SmartServerResponse(('no', )),
1627
938
            request.execute('', ))
1628
939
 
1629
940
 
1630
941
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
1631
942
 
 
943
    def setUp(self):
 
944
        tests.TestCaseWithMemoryTransport.setUp(self)
 
945
 
1632
946
    def test_lock_write_on_unlocked_repo(self):
1633
947
        backing = self.get_transport()
1634
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
948
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1635
949
        repository = self.make_repository('.', format='knit')
1636
950
        response = request.execute('')
1637
951
        nonce = repository.control_files._lock.peek().get('nonce')
1638
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
 
952
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
1639
953
        # The repository is now locked.  Verify that with a new repository
1640
954
        # object.
1641
955
        new_repo = repository.bzrdir.open_repository()
1642
956
        self.assertRaises(errors.LockContention, new_repo.lock_write)
1643
 
        # Cleanup
1644
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1645
 
        response = request.execute('', nonce)
1646
957
 
1647
958
    def test_lock_write_on_locked_repo(self):
1648
959
        backing = self.get_transport()
1649
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
960
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1650
961
        repository = self.make_repository('.', format='knit')
1651
 
        repo_token = repository.lock_write().repository_token
 
962
        repository.lock_write()
1652
963
        repository.leave_lock_in_place()
1653
964
        repository.unlock()
1654
965
        response = request.execute('')
1655
966
        self.assertEqual(
1656
 
            smart_req.SmartServerResponse(('LockContention',)), response)
1657
 
        # Cleanup
1658
 
        repository.lock_write(repo_token)
1659
 
        repository.dont_leave_lock_in_place()
1660
 
        repository.unlock()
 
967
            SmartServerResponse(('LockContention',)), response)
1661
968
 
1662
969
    def test_lock_write_on_readonly_transport(self):
1663
970
        backing = self.get_readonly_transport()
1664
 
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
 
971
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
1665
972
        repository = self.make_repository('.', format='knit')
1666
973
        response = request.execute('')
1667
974
        self.assertFalse(response.is_successful())
1668
975
        self.assertEqual('LockFailed', response.args[0])
1669
976
 
1670
977
 
1671
 
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
1672
 
 
1673
 
    def make_empty_byte_stream(self, repo):
1674
 
        byte_stream = smart_repo._stream_to_byte_stream([], repo._format)
1675
 
        return ''.join(byte_stream)
1676
 
 
1677
 
 
1678
 
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
1679
 
 
1680
 
    def test_insert_stream_empty(self):
1681
 
        backing = self.get_transport()
1682
 
        request = smart_repo.SmartServerRepositoryInsertStream(backing)
1683
 
        repository = self.make_repository('.')
1684
 
        response = request.execute('', '')
1685
 
        self.assertEqual(None, response)
1686
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1687
 
        self.assertEqual(None, response)
1688
 
        response = request.do_end()
1689
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1690
 
 
1691
 
 
1692
 
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
1693
 
 
1694
 
    def test_insert_stream_empty(self):
1695
 
        backing = self.get_transport()
1696
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1697
 
            backing)
1698
 
        repository = self.make_repository('.', format='knit')
1699
 
        lock_token = repository.lock_write().repository_token
1700
 
        response = request.execute('', '', lock_token)
1701
 
        self.assertEqual(None, response)
1702
 
        response = request.do_chunk(self.make_empty_byte_stream(repository))
1703
 
        self.assertEqual(None, response)
1704
 
        response = request.do_end()
1705
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', )), response)
1706
 
        repository.unlock()
1707
 
 
1708
 
    def test_insert_stream_with_wrong_lock_token(self):
1709
 
        backing = self.get_transport()
1710
 
        request = smart_repo.SmartServerRepositoryInsertStreamLocked(
1711
 
            backing)
1712
 
        repository = self.make_repository('.', format='knit')
1713
 
        lock_token = repository.lock_write().repository_token
1714
 
        self.assertRaises(
1715
 
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
1716
 
        repository.unlock()
1717
 
 
1718
 
 
1719
978
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
1720
979
 
1721
980
    def setUp(self):
1723
982
 
1724
983
    def test_unlock_on_locked_repo(self):
1725
984
        backing = self.get_transport()
1726
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
985
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1727
986
        repository = self.make_repository('.', format='knit')
1728
 
        token = repository.lock_write().repository_token
 
987
        token = repository.lock_write()
1729
988
        repository.leave_lock_in_place()
1730
989
        repository.unlock()
1731
990
        response = request.execute('', token)
1732
991
        self.assertEqual(
1733
 
            smart_req.SmartServerResponse(('ok',)), response)
 
992
            SmartServerResponse(('ok',)), response)
1734
993
        # The repository is now unlocked.  Verify that with a new repository
1735
994
        # object.
1736
995
        new_repo = repository.bzrdir.open_repository()
1739
998
 
1740
999
    def test_unlock_on_unlocked_repo(self):
1741
1000
        backing = self.get_transport()
1742
 
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1001
        request = smart.repository.SmartServerRepositoryUnlock(backing)
1743
1002
        repository = self.make_repository('.', format='knit')
1744
1003
        response = request.execute('', 'some token')
1745
1004
        self.assertEqual(
1746
 
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
 
1005
            SmartServerResponse(('TokenMismatch',)), response)
1747
1006
 
1748
1007
 
1749
1008
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1750
1009
 
1751
1010
    def test_is_readonly_no(self):
1752
1011
        backing = self.get_transport()
1753
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1012
        request = smart.request.SmartServerIsReadonly(backing)
1754
1013
        response = request.execute()
1755
1014
        self.assertEqual(
1756
 
            smart_req.SmartServerResponse(('no',)), response)
 
1015
            SmartServerResponse(('no',)), response)
1757
1016
 
1758
1017
    def test_is_readonly_yes(self):
1759
1018
        backing = self.get_readonly_transport()
1760
 
        request = smart_req.SmartServerIsReadonly(backing)
 
1019
        request = smart.request.SmartServerIsReadonly(backing)
1761
1020
        response = request.execute()
1762
1021
        self.assertEqual(
1763
 
            smart_req.SmartServerResponse(('yes',)), response)
1764
 
 
1765
 
 
1766
 
class TestSmartServerRepositorySetMakeWorkingTrees(
1767
 
    tests.TestCaseWithMemoryTransport):
1768
 
 
1769
 
    def test_set_false(self):
1770
 
        backing = self.get_transport()
1771
 
        repo = self.make_repository('.', shared=True)
1772
 
        repo.set_make_working_trees(True)
1773
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1774
 
        request = request_class(backing)
1775
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1776
 
            request.execute('', 'False'))
1777
 
        repo = repo.bzrdir.open_repository()
1778
 
        self.assertFalse(repo.make_working_trees())
1779
 
 
1780
 
    def test_set_true(self):
1781
 
        backing = self.get_transport()
1782
 
        repo = self.make_repository('.', shared=True)
1783
 
        repo.set_make_working_trees(False)
1784
 
        request_class = smart_repo.SmartServerRepositorySetMakeWorkingTrees
1785
 
        request = request_class(backing)
1786
 
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
1787
 
            request.execute('', 'True'))
1788
 
        repo = repo.bzrdir.open_repository()
1789
 
        self.assertTrue(repo.make_working_trees())
1790
 
 
1791
 
 
1792
 
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1793
 
 
1794
 
    def make_repo_needing_autopacking(self, path='.'):
1795
 
        # Make a repo in need of autopacking.
1796
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1797
 
        repo = tree.branch.repository
1798
 
        # monkey-patch the pack collection to disable autopacking
1799
 
        repo._pack_collection._max_pack_count = lambda count: count
1800
 
        for x in range(10):
1801
 
            tree.commit('commit %s' % x)
1802
 
        self.assertEqual(10, len(repo._pack_collection.names()))
1803
 
        del repo._pack_collection._max_pack_count
1804
 
        return repo
1805
 
 
1806
 
    def test_autopack_needed(self):
1807
 
        repo = self.make_repo_needing_autopacking()
1808
 
        repo.lock_write()
1809
 
        self.addCleanup(repo.unlock)
1810
 
        backing = self.get_transport()
1811
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1812
 
            backing)
1813
 
        response = request.execute('')
1814
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1815
 
        repo._pack_collection.reload_pack_names()
1816
 
        self.assertEqual(1, len(repo._pack_collection.names()))
1817
 
 
1818
 
    def test_autopack_not_needed(self):
1819
 
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1820
 
        repo = tree.branch.repository
1821
 
        repo.lock_write()
1822
 
        self.addCleanup(repo.unlock)
1823
 
        for x in range(9):
1824
 
            tree.commit('commit %s' % x)
1825
 
        backing = self.get_transport()
1826
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1827
 
            backing)
1828
 
        response = request.execute('')
1829
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1830
 
        repo._pack_collection.reload_pack_names()
1831
 
        self.assertEqual(9, len(repo._pack_collection.names()))
1832
 
 
1833
 
    def test_autopack_on_nonpack_format(self):
1834
 
        """A request to autopack a non-pack repo is a no-op."""
1835
 
        repo = self.make_repository('.', format='knit')
1836
 
        backing = self.get_transport()
1837
 
        request = smart_packrepo.SmartServerPackRepositoryAutopack(
1838
 
            backing)
1839
 
        response = request.execute('')
1840
 
        self.assertEqual(smart_req.SmartServerResponse(('ok',)), response)
1841
 
 
1842
 
 
1843
 
class TestSmartServerVfsGet(tests.TestCaseWithMemoryTransport):
1844
 
 
1845
 
    def test_unicode_path(self):
1846
 
        """VFS requests expect unicode paths to be escaped."""
1847
 
        filename = u'foo\N{INTERROBANG}'
1848
 
        filename_escaped = urlutils.escape(filename)
1849
 
        backing = self.get_transport()
1850
 
        request = vfs.GetRequest(backing)
1851
 
        backing.put_bytes_non_atomic(filename_escaped, 'contents')
1852
 
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'contents'),
1853
 
            request.execute(filename_escaped))
 
1022
            SmartServerResponse(('yes',)), response)
1854
1023
 
1855
1024
 
1856
1025
class TestHandlers(tests.TestCase):
1860
1029
        """All registered request_handlers can be found."""
1861
1030
        # If there's a typo in a register_lazy call, this loop will fail with
1862
1031
        # an AttributeError.
1863
 
        for key, item in smart_req.request_handlers.iteritems():
 
1032
        for key, item in smart.request.request_handlers.iteritems():
1864
1033
            pass
1865
1034
 
1866
 
    def assertHandlerEqual(self, verb, handler):
1867
 
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
1868
 
 
1869
1035
    def test_registered_methods(self):
1870
1036
        """Test that known methods are registered to the correct object."""
1871
 
        self.assertHandlerEqual('Branch.get_config_file',
1872
 
            smart_branch.SmartServerBranchGetConfigFile)
1873
 
        self.assertHandlerEqual('Branch.get_parent',
1874
 
            smart_branch.SmartServerBranchGetParent)
1875
 
        self.assertHandlerEqual('Branch.get_tags_bytes',
1876
 
            smart_branch.SmartServerBranchGetTagsBytes)
1877
 
        self.assertHandlerEqual('Branch.lock_write',
1878
 
            smart_branch.SmartServerBranchRequestLockWrite)
1879
 
        self.assertHandlerEqual('Branch.last_revision_info',
1880
 
            smart_branch.SmartServerBranchRequestLastRevisionInfo)
1881
 
        self.assertHandlerEqual('Branch.revision_history',
1882
 
            smart_branch.SmartServerRequestRevisionHistory)
1883
 
        self.assertHandlerEqual('Branch.set_config_option',
1884
 
            smart_branch.SmartServerBranchRequestSetConfigOption)
1885
 
        self.assertHandlerEqual('Branch.set_last_revision',
1886
 
            smart_branch.SmartServerBranchRequestSetLastRevision)
1887
 
        self.assertHandlerEqual('Branch.set_last_revision_info',
1888
 
            smart_branch.SmartServerBranchRequestSetLastRevisionInfo)
1889
 
        self.assertHandlerEqual('Branch.set_last_revision_ex',
1890
 
            smart_branch.SmartServerBranchRequestSetLastRevisionEx)
1891
 
        self.assertHandlerEqual('Branch.set_parent_location',
1892
 
            smart_branch.SmartServerBranchRequestSetParentLocation)
1893
 
        self.assertHandlerEqual('Branch.unlock',
1894
 
            smart_branch.SmartServerBranchRequestUnlock)
1895
 
        self.assertHandlerEqual('BzrDir.find_repository',
1896
 
            smart_dir.SmartServerRequestFindRepositoryV1)
1897
 
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
1898
 
            smart_dir.SmartServerRequestFindRepositoryV2)
1899
 
        self.assertHandlerEqual('BzrDirFormat.initialize',
1900
 
            smart_dir.SmartServerRequestInitializeBzrDir)
1901
 
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
1902
 
            smart_dir.SmartServerRequestBzrDirInitializeEx)
1903
 
        self.assertHandlerEqual('BzrDir.cloning_metadir',
1904
 
            smart_dir.SmartServerBzrDirRequestCloningMetaDir)
1905
 
        self.assertHandlerEqual('BzrDir.get_config_file',
1906
 
            smart_dir.SmartServerBzrDirRequestConfigFile)
1907
 
        self.assertHandlerEqual('BzrDir.open_branch',
1908
 
            smart_dir.SmartServerRequestOpenBranch)
1909
 
        self.assertHandlerEqual('BzrDir.open_branchV2',
1910
 
            smart_dir.SmartServerRequestOpenBranchV2)
1911
 
        self.assertHandlerEqual('BzrDir.open_branchV3',
1912
 
            smart_dir.SmartServerRequestOpenBranchV3)
1913
 
        self.assertHandlerEqual('PackRepository.autopack',
1914
 
            smart_packrepo.SmartServerPackRepositoryAutopack)
1915
 
        self.assertHandlerEqual('Repository.gather_stats',
1916
 
            smart_repo.SmartServerRepositoryGatherStats)
1917
 
        self.assertHandlerEqual('Repository.get_parent_map',
1918
 
            smart_repo.SmartServerRepositoryGetParentMap)
1919
 
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
1920
 
            smart_repo.SmartServerRepositoryGetRevIdForRevno)
1921
 
        self.assertHandlerEqual('Repository.get_revision_graph',
1922
 
            smart_repo.SmartServerRepositoryGetRevisionGraph)
1923
 
        self.assertHandlerEqual('Repository.get_stream',
1924
 
            smart_repo.SmartServerRepositoryGetStream)
1925
 
        self.assertHandlerEqual('Repository.get_stream_1.19',
1926
 
            smart_repo.SmartServerRepositoryGetStream_1_19)
1927
 
        self.assertHandlerEqual('Repository.has_revision',
1928
 
            smart_repo.SmartServerRequestHasRevision)
1929
 
        self.assertHandlerEqual('Repository.insert_stream',
1930
 
            smart_repo.SmartServerRepositoryInsertStream)
1931
 
        self.assertHandlerEqual('Repository.insert_stream_locked',
1932
 
            smart_repo.SmartServerRepositoryInsertStreamLocked)
1933
 
        self.assertHandlerEqual('Repository.is_shared',
1934
 
            smart_repo.SmartServerRepositoryIsShared)
1935
 
        self.assertHandlerEqual('Repository.lock_write',
1936
 
            smart_repo.SmartServerRepositoryLockWrite)
1937
 
        self.assertHandlerEqual('Repository.tarball',
1938
 
            smart_repo.SmartServerRepositoryTarball)
1939
 
        self.assertHandlerEqual('Repository.unlock',
1940
 
            smart_repo.SmartServerRepositoryUnlock)
1941
 
        self.assertHandlerEqual('Transport.is_readonly',
1942
 
            smart_req.SmartServerIsReadonly)
1943
 
 
1944
 
 
1945
 
class SmartTCPServerHookTests(tests.TestCaseWithMemoryTransport):
1946
 
    """Tests for SmartTCPServer hooks."""
1947
 
 
1948
 
    def setUp(self):
1949
 
        super(SmartTCPServerHookTests, self).setUp()
1950
 
        self.server = server.SmartTCPServer(self.get_transport())
1951
 
 
1952
 
    def test_run_server_started_hooks(self):
1953
 
        """Test the server started hooks get fired properly."""
1954
 
        started_calls = []
1955
 
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1956
 
            lambda backing_urls, url: started_calls.append((backing_urls, url)),
1957
 
            None)
1958
 
        started_ex_calls = []
1959
 
        server.SmartTCPServer.hooks.install_named_hook('server_started_ex',
1960
 
            lambda backing_urls, url: started_ex_calls.append((backing_urls, url)),
1961
 
            None)
1962
 
        self.server._sockname = ('example.com', 42)
1963
 
        self.server.run_server_started_hooks()
1964
 
        self.assertEquals(started_calls,
1965
 
            [([self.get_transport().base], 'bzr://example.com:42/')])
1966
 
        self.assertEquals(started_ex_calls,
1967
 
            [([self.get_transport().base], self.server)])
1968
 
 
1969
 
    def test_run_server_started_hooks_ipv6(self):
1970
 
        """Test that socknames can contain 4-tuples."""
1971
 
        self.server._sockname = ('::', 42, 0, 0)
1972
 
        started_calls = []
1973
 
        server.SmartTCPServer.hooks.install_named_hook('server_started',
1974
 
            lambda backing_urls, url: started_calls.append((backing_urls, url)),
1975
 
            None)
1976
 
        self.server.run_server_started_hooks()
1977
 
        self.assertEquals(started_calls,
1978
 
                [([self.get_transport().base], 'bzr://:::42/')])
1979
 
 
1980
 
    def test_run_server_stopped_hooks(self):
1981
 
        """Test the server stopped hooks."""
1982
 
        self.server._sockname = ('example.com', 42)
1983
 
        stopped_calls = []
1984
 
        server.SmartTCPServer.hooks.install_named_hook('server_stopped',
1985
 
            lambda backing_urls, url: stopped_calls.append((backing_urls, url)),
1986
 
            None)
1987
 
        self.server.run_server_stopped_hooks()
1988
 
        self.assertEquals(stopped_calls,
1989
 
            [([self.get_transport().base], 'bzr://example.com:42/')])
 
1037
        self.assertEqual(
 
1038
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1039
            smart.branch.SmartServerBranchGetConfigFile)
 
1040
        self.assertEqual(
 
1041
            smart.request.request_handlers.get('Branch.lock_write'),
 
1042
            smart.branch.SmartServerBranchRequestLockWrite)
 
1043
        self.assertEqual(
 
1044
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1045
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
 
1046
        self.assertEqual(
 
1047
            smart.request.request_handlers.get('Branch.revision_history'),
 
1048
            smart.branch.SmartServerRequestRevisionHistory)
 
1049
        self.assertEqual(
 
1050
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1051
            smart.branch.SmartServerBranchRequestSetLastRevision)
 
1052
        self.assertEqual(
 
1053
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1054
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
 
1055
        self.assertEqual(
 
1056
            smart.request.request_handlers.get('Branch.unlock'),
 
1057
            smart.branch.SmartServerBranchRequestUnlock)
 
1058
        self.assertEqual(
 
1059
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1060
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
 
1061
        self.assertEqual(
 
1062
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1063
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
 
1064
        self.assertEqual(
 
1065
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1066
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
 
1067
        self.assertEqual(
 
1068
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1069
            smart.bzrdir.SmartServerRequestOpenBranch)
 
1070
        self.assertEqual(
 
1071
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1072
            smart.repository.SmartServerRepositoryGatherStats)
 
1073
        self.assertEqual(
 
1074
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1075
            smart.repository.SmartServerRepositoryGetParentMap)
 
1076
        self.assertEqual(
 
1077
            smart.request.request_handlers.get(
 
1078
                'Repository.get_revision_graph'),
 
1079
            smart.repository.SmartServerRepositoryGetRevisionGraph)
 
1080
        self.assertEqual(
 
1081
            smart.request.request_handlers.get('Repository.has_revision'),
 
1082
            smart.repository.SmartServerRequestHasRevision)
 
1083
        self.assertEqual(
 
1084
            smart.request.request_handlers.get('Repository.is_shared'),
 
1085
            smart.repository.SmartServerRepositoryIsShared)
 
1086
        self.assertEqual(
 
1087
            smart.request.request_handlers.get('Repository.lock_write'),
 
1088
            smart.repository.SmartServerRepositoryLockWrite)
 
1089
        self.assertEqual(
 
1090
            smart.request.request_handlers.get('Repository.tarball'),
 
1091
            smart.repository.SmartServerRepositoryTarball)
 
1092
        self.assertEqual(
 
1093
            smart.request.request_handlers.get('Repository.unlock'),
 
1094
            smart.repository.SmartServerRepositoryUnlock)
 
1095
        self.assertEqual(
 
1096
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1097
            smart.request.SmartServerIsReadonly)