← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2011 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the smart wire/domain protocol.
18
18
 
25
25
"""
26
26
 
27
27
import bz2
28
 
from cStringIO import StringIO
29
 
import tarfile
30
28
 
31
29
from bzrlib import (
 
30
    branch as _mod_branch,
32
31
    bzrdir,
33
32
    errors,
34
 
    pack,
35
 
    smart,
36
33
    tests,
 
34
    transport,
37
35
    urlutils,
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
 
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
    )
56
52
 
57
53
 
58
54
def load_tests(standard_tests, module, loader):
59
55
    """Multiply tests version and protocol consistency."""
60
56
    # FindRepository tests.
61
 
    bzrdir_mod = bzrlib.smart.bzrdir
62
 
    applier = TestScenarioApplier()
63
 
    applier.scenarios = [
 
57
    scenarios = [
64
58
        ("find_repository", {
65
 
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
 
59
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV1}),
66
60
        ("find_repositoryV2", {
67
 
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
 
61
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV2}),
 
62
        ("find_repositoryV3", {
 
63
            "_request_class": smart_dir.SmartServerRequestFindRepositoryV3}),
68
64
        ]
69
 
    to_adapt, result = split_suite_by_re(standard_tests,
 
65
    to_adapt, result = tests.split_suite_by_re(standard_tests,
70
66
        "TestSmartServerRequestFindRepository")
71
 
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
 
67
    v2_only, v1_and_2 = tests.split_suite_by_re(to_adapt,
72
68
        "_v2")
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))
 
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)
78
73
    return result
79
74
 
80
75
 
81
76
class TestCaseWithChrootedTransport(tests.TestCaseWithTransport):
82
77
 
83
78
    def setUp(self):
 
79
        self.vfs_transport_factory = memory.MemoryServer
84
80
        tests.TestCaseWithTransport.setUp(self)
85
81
        self._chroot_server = None
86
82
 
88
84
        if self._chroot_server is None:
89
85
            backing_transport = tests.TestCaseWithTransport.get_transport(self)
90
86
            self._chroot_server = chroot.ChrootServer(backing_transport)
91
 
            self._chroot_server.setUp()
92
 
            self.addCleanup(self._chroot_server.tearDown)
93
 
        t = get_transport(self._chroot_server.get_url())
 
87
            self.start_server(self._chroot_server)
 
88
        t = transport.get_transport(self._chroot_server.get_url())
94
89
        if relpath is not None:
95
90
            t = t.clone(relpath)
96
91
        return t
97
92
 
98
93
 
99
 
class TestCaseWithSmartMedium(tests.TestCaseWithTransport):
 
94
class TestCaseWithSmartMedium(tests.TestCaseWithMemoryTransport):
100
95
 
101
96
    def setUp(self):
102
97
        super(TestCaseWithSmartMedium, self).setUp()
104
99
        # the default or a parameterized class, but rather use the
105
100
        # TestCaseWithTransport infrastructure to set up a smart server and
106
101
        # transport.
107
 
        self.transport_server = self.make_transport_server
 
102
        self.overrideAttr(self, "transport_server", self.make_transport_server)
108
103
 
109
104
    def make_transport_server(self):
110
 
        return smart.server.SmartTCPServer_for_testing('-' + self.id())
 
105
        return test_server.SmartTCPServer_for_testing('-' + self.id())
111
106
 
112
107
    def get_smart_medium(self):
113
108
        """Get a smart medium to use in tests."""
114
109
        return self.get_transport().get_smart_medium()
115
110
 
116
111
 
 
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
 
117
131
class TestSmartServerResponse(tests.TestCase):
118
132
 
119
133
    def test__eq__(self):
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', )))
 
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', )))
128
142
        self.assertNotEqual(None,
129
 
            SmartServerResponse(('ok', )))
 
143
            smart_req.SmartServerResponse(('ok', )))
130
144
 
131
145
    def test__str__(self):
132
146
        """SmartServerResponses can be stringified."""
133
147
        self.assertEqual(
134
148
            "<SuccessfulSmartServerResponse args=('args',) body='body'>",
135
 
            str(SuccessfulSmartServerResponse(('args',), 'body')))
 
149
            str(smart_req.SuccessfulSmartServerResponse(('args',), 'body')))
136
150
        self.assertEqual(
137
151
            "<FailedSmartServerResponse args=('args',) body='body'>",
138
 
            str(FailedSmartServerResponse(('args',), 'body')))
 
152
            str(smart_req.FailedSmartServerResponse(('args',), 'body')))
139
153
 
140
154
 
141
155
class TestSmartServerRequest(tests.TestCaseWithMemoryTransport):
142
156
 
143
157
    def test_translate_client_path(self):
144
158
        transport = self.get_transport()
145
 
        request = SmartServerRequest(transport, 'foo/')
 
159
        request = smart_req.SmartServerRequest(transport, 'foo/')
146
160
        self.assertEqual('./', request.translate_client_path('foo/'))
147
161
        self.assertRaises(
148
162
            errors.InvalidURLJoin, request.translate_client_path, 'foo/..')
151
165
        self.assertRaises(
152
166
            errors.PathNotChild, request.translate_client_path, 'bar/')
153
167
        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))
154
180
 
155
181
    def test_transport_from_client_path(self):
156
182
        transport = self.get_transport()
157
 
        request = SmartServerRequest(transport, 'foo/')
 
183
        request = smart_req.SmartServerRequest(transport, 'foo/')
158
184
        self.assertEqual(
159
185
            transport.base,
160
186
            request.transport_from_client_path('foo/').base)
161
187
 
162
188
 
 
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
 
163
241
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
164
242
    """Tests for BzrDir.find_repository."""
165
243
 
168
246
        backing = self.get_transport()
169
247
        request = self._request_class(backing)
170
248
        self.make_bzrdir('.')
171
 
        self.assertEqual(SmartServerResponse(('norepository', )),
 
249
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
172
250
            request.execute(''))
173
251
 
174
252
    def test_nonshared_repository(self):
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 
 
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
177
255
        # the repository is at.
178
256
        backing = self.get_transport()
179
257
        request = self._request_class(backing)
180
258
        result = self._make_repository_and_result()
181
259
        self.assertEqual(result, request.execute(''))
182
260
        self.make_bzrdir('subdir')
183
 
        self.assertEqual(SmartServerResponse(('norepository', )),
 
261
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
184
262
            request.execute('subdir'))
185
263
 
186
264
    def _make_repository_and_result(self, shared=False, format=None):
197
275
            subtrees = 'yes'
198
276
        else:
199
277
            subtrees = 'no'
200
 
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
 
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 ==
201
288
            self._request_class):
202
289
            # All tests so far are on formats, and for non-external
203
290
            # repositories.
204
 
            return SuccessfulSmartServerResponse(
205
 
                ('ok', '', rich_root, subtrees, 'no'))
 
291
            return smart_req.SuccessfulSmartServerResponse(
 
292
                ('ok', '', rich_root, subtrees, external))
206
293
        else:
207
 
            return SuccessfulSmartServerResponse(('ok', '', rich_root, subtrees))
 
294
            return smart_req.SuccessfulSmartServerResponse(
 
295
                ('ok', '', rich_root, subtrees))
208
296
 
209
297
    def test_shared_repository(self):
210
298
        """When there is a shared repository, we get 'ok', 'relpath-to-repo'."""
213
301
        result = self._make_repository_and_result(shared=True)
214
302
        self.assertEqual(result, request.execute(''))
215
303
        self.make_bzrdir('subdir')
216
 
        result2 = SmartServerResponse(result.args[0:1] + ('..', ) + result.args[2:])
 
304
        result2 = smart_req.SmartServerResponse(
 
305
            result.args[0:1] + ('..', ) + result.args[2:])
217
306
        self.assertEqual(result2,
218
307
            request.execute('subdir'))
219
308
        self.make_bzrdir('subdir/deeper')
220
 
        result3 = SmartServerResponse(result.args[0:1] + ('../..', ) + result.args[2:])
 
309
        result3 = smart_req.SmartServerResponse(
 
310
            result.args[0:1] + ('../..', ) + result.args[2:])
221
311
        self.assertEqual(result3,
222
312
            request.execute('subdir/deeper'))
223
313
 
225
315
        """Test for the format attributes for rich root and subtree support."""
226
316
        backing = self.get_transport()
227
317
        request = self._request_class(backing)
228
 
        result = self._make_repository_and_result(format='dirstate-with-subtree')
 
318
        result = self._make_repository_and_result(
 
319
            format='dirstate-with-subtree')
229
320
        # check the test will be valid
230
321
        self.assertEqual('yes', result.args[2])
231
322
        self.assertEqual('yes', result.args[3])
235
326
        """Test for the supports_external_lookups attribute."""
236
327
        backing = self.get_transport()
237
328
        request = self._request_class(backing)
238
 
        result = self._make_repository_and_result(format='dirstate-with-subtree')
 
329
        result = self._make_repository_and_result(
 
330
            format='dirstate-with-subtree')
239
331
        # check the test will be valid
240
332
        self.assertEqual('no', result.args[4])
241
333
        self.assertEqual(result, request.execute(''))
242
334
 
243
335
 
 
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
 
244
359
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
245
360
 
246
361
    def test_empty_dir(self):
247
362
        """Initializing an empty dir should succeed and do it."""
248
363
        backing = self.get_transport()
249
 
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
250
 
        self.assertEqual(SmartServerResponse(('ok', )),
 
364
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
 
365
        self.assertEqual(smart_req.SmartServerResponse(('ok', )),
251
366
            request.execute(''))
252
367
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
253
 
        # no branch, tree or repository is expected with the current 
 
368
        # no branch, tree or repository is expected with the current
254
369
        # default formart.
255
370
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
256
371
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
259
374
    def test_missing_dir(self):
260
375
        """Initializing a missing directory should fail like the bzrdir api."""
261
376
        backing = self.get_transport()
262
 
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
377
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
263
378
        self.assertRaises(errors.NoSuchFile,
264
379
            request.execute, 'subdir')
265
380
 
266
381
    def test_initialized_dir(self):
267
382
        """Initializing an extant bzrdir should fail like the bzrdir api."""
268
383
        backing = self.get_transport()
269
 
        request = smart.bzrdir.SmartServerRequestInitializeBzrDir(backing)
 
384
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
270
385
        self.make_bzrdir('subdir')
271
386
        self.assertRaises(errors.FileExists,
272
387
            request.execute, 'subdir')
273
388
 
274
389
 
 
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
 
275
499
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
276
500
 
277
501
    def test_no_branch(self):
278
502
        """When there is no branch, ('nobranch', ) is returned."""
279
503
        backing = self.get_transport()
280
 
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
 
504
        request = smart_dir.SmartServerRequestOpenBranch(backing)
281
505
        self.make_bzrdir('.')
282
 
        self.assertEqual(SmartServerResponse(('nobranch', )),
 
506
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
283
507
            request.execute(''))
284
508
 
285
509
    def test_branch(self):
286
510
        """When there is a branch, 'ok' is returned."""
287
511
        backing = self.get_transport()
288
 
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
 
512
        request = smart_dir.SmartServerRequestOpenBranch(backing)
289
513
        self.make_branch('.')
290
 
        self.assertEqual(SmartServerResponse(('ok', '')),
 
514
        self.assertEqual(smart_req.SmartServerResponse(('ok', '')),
291
515
            request.execute(''))
292
516
 
293
517
    def test_branch_reference(self):
294
518
        """When there is a branch reference, the reference URL is returned."""
 
519
        self.vfs_transport_factory = test_server.LocalURLServer
295
520
        backing = self.get_transport()
296
 
        request = smart.bzrdir.SmartServerRequestOpenBranch(backing)
 
521
        request = smart_dir.SmartServerRequestOpenBranch(backing)
297
522
        branch = self.make_branch('branch')
298
523
        checkout = branch.create_checkout('reference',lightweight=True)
299
 
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
 
524
        reference_url = _mod_branch.BranchReferenceFormat().get_reference(
 
525
            checkout.bzrdir)
300
526
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
301
 
        self.assertEqual(SmartServerResponse(('ok', reference_url)),
 
527
        self.assertEqual(smart_req.SmartServerResponse(('ok', reference_url)),
302
528
            request.execute('reference'))
303
529
 
 
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
 
304
665
 
305
666
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
306
667
 
307
668
    def test_empty(self):
308
669
        """For an empty branch, the body is empty."""
309
670
        backing = self.get_transport()
310
 
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
 
671
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
311
672
        self.make_branch('.')
312
 
        self.assertEqual(SmartServerResponse(('ok', ), ''),
 
673
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), ''),
313
674
            request.execute(''))
314
675
 
315
676
    def test_not_empty(self):
316
677
        """For a non-empty branch, the body is empty."""
317
678
        backing = self.get_transport()
318
 
        request = smart.branch.SmartServerRequestRevisionHistory(backing)
 
679
        request = smart_branch.SmartServerRequestRevisionHistory(backing)
319
680
        tree = self.make_branch_and_memory_tree('.')
320
681
        tree.lock_write()
321
682
        tree.add('')
323
684
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
324
685
        tree.unlock()
325
686
        self.assertEqual(
326
 
            SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
 
687
            smart_req.SmartServerResponse(('ok', ), ('\x00'.join([r1, r2]))),
327
688
            request.execute(''))
328
689
 
329
690
 
332
693
    def test_no_branch(self):
333
694
        """When there is a bzrdir and no branch, NotBranchError is raised."""
334
695
        backing = self.get_transport()
335
 
        request = smart.branch.SmartServerBranchRequest(backing)
 
696
        request = smart_branch.SmartServerBranchRequest(backing)
336
697
        self.make_bzrdir('.')
337
698
        self.assertRaises(errors.NotBranchError,
338
699
            request.execute, '')
340
701
    def test_branch_reference(self):
341
702
        """When there is a branch reference, NotBranchError is raised."""
342
703
        backing = self.get_transport()
343
 
        request = smart.branch.SmartServerBranchRequest(backing)
 
704
        request = smart_branch.SmartServerBranchRequest(backing)
344
705
        branch = self.make_branch('branch')
345
706
        checkout = branch.create_checkout('reference',lightweight=True)
346
707
        self.assertRaises(errors.NotBranchError,
347
708
            request.execute, 'checkout')
348
709
 
349
710
 
350
 
class TestSmartServerBranchRequestLastRevisionInfo(tests.TestCaseWithMemoryTransport):
 
711
class TestSmartServerBranchRequestLastRevisionInfo(
 
712
    tests.TestCaseWithMemoryTransport):
351
713
 
352
714
    def test_empty(self):
353
715
        """For an empty branch, the result is ('ok', '0', 'null:')."""
354
716
        backing = self.get_transport()
355
 
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
717
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
356
718
        self.make_branch('.')
357
 
        self.assertEqual(SmartServerResponse(('ok', '0', 'null:')),
 
719
        self.assertEqual(smart_req.SmartServerResponse(('ok', '0', 'null:')),
358
720
            request.execute(''))
359
721
 
360
722
    def test_not_empty(self):
361
723
        """For a non-empty branch, the result is ('ok', 'revno', 'revid')."""
362
724
        backing = self.get_transport()
363
 
        request = smart.branch.SmartServerBranchRequestLastRevisionInfo(backing)
 
725
        request = smart_branch.SmartServerBranchRequestLastRevisionInfo(backing)
364
726
        tree = self.make_branch_and_memory_tree('.')
365
727
        tree.lock_write()
366
728
        tree.add('')
369
731
        r2 = tree.commit('2nd commit', rev_id=rev_id_utf8)
370
732
        tree.unlock()
371
733
        self.assertEqual(
372
 
            SmartServerResponse(('ok', '2', rev_id_utf8)),
 
734
            smart_req.SmartServerResponse(('ok', '2', rev_id_utf8)),
373
735
            request.execute(''))
374
736
 
375
737
 
376
 
class TestSmartServerBranchRequestGetConfigFile(tests.TestCaseWithMemoryTransport):
 
738
class TestSmartServerBranchRequestGetConfigFile(
 
739
    tests.TestCaseWithMemoryTransport):
377
740
 
378
741
    def test_default(self):
379
742
        """With no file, we get empty content."""
380
743
        backing = self.get_transport()
381
 
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
 
744
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
382
745
        branch = self.make_branch('.')
383
746
        # there should be no file by default
384
747
        content = ''
385
 
        self.assertEqual(SmartServerResponse(('ok', ), content),
 
748
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), content),
386
749
            request.execute(''))
387
750
 
388
751
    def test_with_content(self):
389
752
        # SmartServerBranchGetConfigFile should return the content from
390
753
        # branch.control_files.get('branch.conf') for now - in the future it may
391
 
        # perform more complex processing. 
 
754
        # perform more complex processing.
392
755
        backing = self.get_transport()
393
 
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
 
756
        request = smart_branch.SmartServerBranchGetConfigFile(backing)
394
757
        branch = self.make_branch('.')
395
758
        branch._transport.put_bytes('branch.conf', 'foo bar baz')
396
 
        self.assertEqual(SmartServerResponse(('ok', ), 'foo bar baz'),
 
759
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), 'foo bar baz'),
397
760
            request.execute(''))
398
761
 
399
762
 
400
 
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
 
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):
401
877
    """Base test case for verbs that implement set_last_revision."""
402
878
 
403
879
    def setUp(self):
407
883
        self.tree = self.make_branch_and_memory_tree('.')
408
884
 
409
885
    def lock_branch(self):
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
 
886
        return self.get_lock_tokens(self.tree.branch)
415
887
 
416
888
    def unlock_branch(self):
417
889
        self.tree.branch.unlock()
418
 
        
 
890
 
419
891
    def set_last_revision(self, revision_id, revno):
420
892
        branch_token, repo_token = self.lock_branch()
421
893
        response = self._set_last_revision(
425
897
 
426
898
    def assertRequestSucceeds(self, revision_id, revno):
427
899
        response = self.set_last_revision(revision_id, revno)
428
 
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
429
 
 
430
 
        
 
900
        self.assertEqual(smart_req.SuccessfulSmartServerResponse(('ok',)),
 
901
                         response)
 
902
 
 
903
 
431
904
class TestSetLastRevisionVerbMixin(object):
432
905
    """Mixin test case for verbs that implement set_last_revision."""
433
906
 
439
912
        """If the revision_id is not present, the verb returns NoSuchRevision.
440
913
        """
441
914
        revision_id = 'non-existent revision'
442
 
        self.assertEqual(
443
 
            FailedSmartServerResponse(('NoSuchRevision', revision_id)),
444
 
            self.set_last_revision(revision_id, 1))
 
915
        self.assertEqual(smart_req.FailedSmartServerResponse(('NoSuchRevision',
 
916
                                                              revision_id)),
 
917
                         self.set_last_revision(revision_id, 1))
445
918
 
446
919
    def make_tree_with_two_commits(self):
447
920
        self.tree.lock_write()
459
932
        # its repository.
460
933
        self.make_tree_with_two_commits()
461
934
        rev_id_utf8 = u'\xc8'.encode('utf-8')
462
 
        self.tree.branch.set_revision_history([])
 
935
        self.tree.branch.set_last_revision_info(0, 'null:')
463
936
        self.assertEqual(
464
937
            (0, 'null:'), self.tree.branch.last_revision_info())
465
938
        # We can update the branch to a revision that is present in the
487
960
        rejection_message = u'rejection message\N{INTERROBANG}'
488
961
        def hook_that_rejects(params):
489
962
            raise errors.TipChangeRejected(rejection_message)
490
 
        Branch.hooks.install_named_hook(
 
963
        _mod_branch.Branch.hooks.install_named_hook(
491
964
            'pre_change_branch_tip', hook_that_rejects, None)
492
965
        self.assertEqual(
493
 
            FailedSmartServerResponse(
 
966
            smart_req.FailedSmartServerResponse(
494
967
                ('TipChangeRejected', rejection_message.encode('utf-8'))),
495
968
            self.set_last_revision('null:', 0))
496
969
 
499
972
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
500
973
    """Tests for Branch.set_last_revision verb."""
501
974
 
502
 
    request_class = smart.branch.SmartServerBranchRequestSetLastRevision
 
975
    request_class = smart_branch.SmartServerBranchRequestSetLastRevision
503
976
 
504
977
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
505
978
        return self.request.execute(
510
983
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
511
984
    """Tests for Branch.set_last_revision_info verb."""
512
985
 
513
 
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionInfo
 
986
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionInfo
514
987
 
515
988
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
516
989
        return self.request.execute(
527
1000
        SetLastRevisionTestBase, TestSetLastRevisionVerbMixin):
528
1001
    """Tests for Branch.set_last_revision_ex verb."""
529
1002
 
530
 
    request_class = smart.branch.SmartServerBranchRequestSetLastRevisionEx
 
1003
    request_class = smart_branch.SmartServerBranchRequestSetLastRevisionEx
531
1004
 
532
1005
    def _set_last_revision(self, revision_id, revno, branch_token, repo_token):
533
1006
        return self.request.execute(
536
1009
    def assertRequestSucceeds(self, revision_id, revno):
537
1010
        response = self.set_last_revision(revision_id, revno)
538
1011
        self.assertEqual(
539
 
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
 
1012
            smart_req.SuccessfulSmartServerResponse(('ok', revno, revision_id)),
540
1013
            response)
541
 
        
 
1014
 
542
1015
    def test_branch_last_revision_info_rewind(self):
543
1016
        """A branch's tip can be set to a revision that is an ancestor of the
544
1017
        current tip, but only if allow_overwrite_descendant is passed.
553
1026
        response = self.request.execute(
554
1027
            '', branch_token, repo_token, rev_id_utf8, 0, 0)
555
1028
        self.assertEqual(
556
 
            SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
 
1029
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'rev-2')),
557
1030
            response)
558
1031
        self.assertEqual(
559
1032
            (2, 'rev-2'), self.tree.branch.last_revision_info())
563
1036
        response = self.request.execute(
564
1037
            '', branch_token, repo_token, rev_id_utf8, 0, 1)
565
1038
        self.assertEqual(
566
 
            SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
 
1039
            smart_req.SuccessfulSmartServerResponse(('ok', 1, rev_id_utf8)),
567
1040
            response)
568
1041
        self.unlock_branch()
569
1042
        self.assertEqual(
587
1060
        # child-1.
588
1061
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
589
1062
        self.tree.unlock()
590
 
        
 
1063
 
591
1064
    def test_not_allow_diverged(self):
592
1065
        """If allow_diverged is not passed, then setting a divergent history
593
1066
        returns a Diverged error.
594
1067
        """
595
1068
        self.make_branch_with_divergent_history()
596
1069
        self.assertEqual(
597
 
            FailedSmartServerResponse(('Diverged',)),
 
1070
            smart_req.FailedSmartServerResponse(('Diverged',)),
598
1071
            self.set_last_revision('child-1', 2))
599
1072
        # The branch tip was not changed.
600
1073
        self.assertEqual('child-2', self.tree.branch.last_revision())
608
1081
        response = self.request.execute(
609
1082
            '', branch_token, repo_token, 'child-1', 1, 0)
610
1083
        self.assertEqual(
611
 
            SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
 
1084
            smart_req.SuccessfulSmartServerResponse(('ok', 2, 'child-1')),
612
1085
            response)
613
1086
        self.unlock_branch()
614
1087
        # The branch tip was changed.
615
1088
        self.assertEqual('child-1', self.tree.branch.last_revision())
616
1089
 
617
1090
 
 
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
 
618
1155
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
619
1156
 
620
1157
    def test_get_stacked_on_url(self):
622
1159
        stacked_branch = self.make_branch('stacked', format='1.6')
623
1160
        # typically should be relative
624
1161
        stacked_branch.set_stacked_on_url('../base')
625
 
        request = smart.branch.SmartServerBranchRequestGetStackedOnURL(
 
1162
        request = smart_branch.SmartServerBranchRequestGetStackedOnURL(
626
1163
            self.get_transport())
627
1164
        response = request.execute('stacked')
628
1165
        self.assertEquals(
629
 
            SmartServerResponse(('ok', '../base')),
 
1166
            smart_req.SmartServerResponse(('ok', '../base')),
630
1167
            response)
631
1168
 
632
1169
 
633
 
class TestSmartServerBranchRequestLockWrite(tests.TestCaseWithMemoryTransport):
 
1170
class TestSmartServerBranchRequestLockWrite(TestLockedBranch):
634
1171
 
635
1172
    def setUp(self):
636
1173
        tests.TestCaseWithMemoryTransport.setUp(self)
637
1174
 
638
1175
    def test_lock_write_on_unlocked_branch(self):
639
1176
        backing = self.get_transport()
640
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1177
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
641
1178
        branch = self.make_branch('.', format='knit')
642
1179
        repository = branch.repository
643
1180
        response = request.execute('')
644
1181
        branch_nonce = branch.control_files._lock.peek().get('nonce')
645
1182
        repository_nonce = repository.control_files._lock.peek().get('nonce')
646
 
        self.assertEqual(
647
 
            SmartServerResponse(('ok', branch_nonce, repository_nonce)),
648
 
            response)
 
1183
        self.assertEqual(smart_req.SmartServerResponse(
 
1184
                ('ok', branch_nonce, repository_nonce)),
 
1185
                         response)
649
1186
        # The branch (and associated repository) is now locked.  Verify that
650
1187
        # with a new branch object.
651
1188
        new_branch = repository.bzrdir.open_branch()
652
1189
        self.assertRaises(errors.LockContention, new_branch.lock_write)
 
1190
        # Cleanup
 
1191
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
 
1192
        response = request.execute('', branch_nonce, repository_nonce)
653
1193
 
654
1194
    def test_lock_write_on_locked_branch(self):
655
1195
        backing = self.get_transport()
656
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1196
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
657
1197
        branch = self.make_branch('.')
658
 
        branch.lock_write()
 
1198
        branch_token = branch.lock_write().branch_token
659
1199
        branch.leave_lock_in_place()
660
1200
        branch.unlock()
661
1201
        response = request.execute('')
662
1202
        self.assertEqual(
663
 
            SmartServerResponse(('LockContention',)), response)
 
1203
            smart_req.SmartServerResponse(('LockContention',)), response)
 
1204
        # Cleanup
 
1205
        branch.lock_write(branch_token)
 
1206
        branch.dont_leave_lock_in_place()
 
1207
        branch.unlock()
664
1208
 
665
1209
    def test_lock_write_with_tokens_on_locked_branch(self):
666
1210
        backing = self.get_transport()
667
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1211
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
668
1212
        branch = self.make_branch('.', format='knit')
669
 
        branch_token = branch.lock_write()
670
 
        repo_token = branch.repository.lock_write()
671
 
        branch.repository.unlock()
 
1213
        branch_token, repo_token = self.get_lock_tokens(branch)
672
1214
        branch.leave_lock_in_place()
673
1215
        branch.repository.leave_lock_in_place()
674
1216
        branch.unlock()
675
1217
        response = request.execute('',
676
1218
                                   branch_token, repo_token)
677
1219
        self.assertEqual(
678
 
            SmartServerResponse(('ok', branch_token, repo_token)), response)
 
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()
679
1229
 
680
1230
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
681
1231
        backing = self.get_transport()
682
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1232
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
683
1233
        branch = self.make_branch('.', format='knit')
684
 
        branch_token = branch.lock_write()
685
 
        repo_token = branch.repository.lock_write()
686
 
        branch.repository.unlock()
 
1234
        branch_token, repo_token = self.get_lock_tokens(branch)
687
1235
        branch.leave_lock_in_place()
688
1236
        branch.repository.leave_lock_in_place()
689
1237
        branch.unlock()
690
1238
        response = request.execute('',
691
1239
                                   branch_token+'xxx', repo_token)
692
1240
        self.assertEqual(
693
 
            SmartServerResponse(('TokenMismatch',)), response)
 
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()
694
1249
 
695
1250
    def test_lock_write_on_locked_repo(self):
696
1251
        backing = self.get_transport()
697
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1252
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
698
1253
        branch = self.make_branch('.', format='knit')
699
 
        branch.repository.lock_write()
700
 
        branch.repository.leave_lock_in_place()
701
 
        branch.repository.unlock()
 
1254
        repo = branch.repository
 
1255
        repo_token = repo.lock_write().repository_token
 
1256
        repo.leave_lock_in_place()
 
1257
        repo.unlock()
702
1258
        response = request.execute('')
703
1259
        self.assertEqual(
704
 
            SmartServerResponse(('LockContention',)), response)
 
1260
            smart_req.SmartServerResponse(('LockContention',)), response)
 
1261
        # Cleanup
 
1262
        repo.lock_write(repo_token)
 
1263
        repo.dont_leave_lock_in_place()
 
1264
        repo.unlock()
705
1265
 
706
1266
    def test_lock_write_on_readonly_transport(self):
707
1267
        backing = self.get_readonly_transport()
708
 
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
 
1268
        request = smart_branch.SmartServerBranchRequestLockWrite(backing)
709
1269
        branch = self.make_branch('.')
710
1270
        root = self.get_transport().clone('/')
711
1271
        path = urlutils.relative_url(root.base, self.get_transport().base)
715
1275
        self.assertEqual('LockFailed', error_name)
716
1276
 
717
1277
 
718
 
class TestSmartServerBranchRequestUnlock(tests.TestCaseWithMemoryTransport):
 
1278
class TestSmartServerBranchRequestUnlock(TestLockedBranch):
719
1279
 
720
1280
    def setUp(self):
721
1281
        tests.TestCaseWithMemoryTransport.setUp(self)
722
1282
 
723
1283
    def test_unlock_on_locked_branch_and_repo(self):
724
1284
        backing = self.get_transport()
725
 
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
1285
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
726
1286
        branch = self.make_branch('.', format='knit')
727
1287
        # Lock the branch
728
 
        branch_token = branch.lock_write()
729
 
        repo_token = branch.repository.lock_write()
730
 
        branch.repository.unlock()
 
1288
        branch_token, repo_token = self.get_lock_tokens(branch)
731
1289
        # Unlock the branch (and repo) object, leaving the physical locks
732
1290
        # in place.
733
1291
        branch.leave_lock_in_place()
736
1294
        response = request.execute('',
737
1295
                                   branch_token, repo_token)
738
1296
        self.assertEqual(
739
 
            SmartServerResponse(('ok',)), response)
 
1297
            smart_req.SmartServerResponse(('ok',)), response)
740
1298
        # The branch is now unlocked.  Verify that with a new branch
741
1299
        # object.
742
1300
        new_branch = branch.bzrdir.open_branch()
745
1303
 
746
1304
    def test_unlock_on_unlocked_branch_unlocked_repo(self):
747
1305
        backing = self.get_transport()
748
 
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
1306
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
749
1307
        branch = self.make_branch('.', format='knit')
750
1308
        response = request.execute(
751
1309
            '', 'branch token', 'repo token')
752
1310
        self.assertEqual(
753
 
            SmartServerResponse(('TokenMismatch',)), response)
 
1311
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
754
1312
 
755
1313
    def test_unlock_on_unlocked_branch_locked_repo(self):
756
1314
        backing = self.get_transport()
757
 
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
1315
        request = smart_branch.SmartServerBranchRequestUnlock(backing)
758
1316
        branch = self.make_branch('.', format='knit')
759
1317
        # Lock the repository.
760
 
        repo_token = branch.repository.lock_write()
 
1318
        repo_token = branch.repository.lock_write().repository_token
761
1319
        branch.repository.leave_lock_in_place()
762
1320
        branch.repository.unlock()
763
1321
        # Issue branch lock_write request on the unlocked branch (with locked
764
1322
        # repo).
765
 
        response = request.execute(
766
 
            '', 'branch token', repo_token)
 
1323
        response = request.execute('', 'branch token', repo_token)
767
1324
        self.assertEqual(
768
 
            SmartServerResponse(('TokenMismatch',)), response)
 
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()
769
1330
 
770
1331
 
771
1332
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
777
1338
        # its the exact path being looked at and the server is not
778
1339
        # searching.
779
1340
        backing = self.get_transport()
780
 
        request = smart.repository.SmartServerRepositoryRequest(backing)
 
1341
        request = smart_repo.SmartServerRepositoryRequest(backing)
781
1342
        self.make_repository('.', shared=True)
782
1343
        self.make_bzrdir('subdir')
783
1344
        self.assertRaises(errors.NoRepositoryPresent,
789
1350
    def test_trivial_bzipped(self):
790
1351
        # This tests that the wire encoding is actually bzipped
791
1352
        backing = self.get_transport()
792
 
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
 
1353
        request = smart_repo.SmartServerRepositoryGetParentMap(backing)
793
1354
        tree = self.make_branch_and_memory_tree('.')
794
1355
 
795
1356
        self.assertEqual(None,
796
1357
            request.execute('', 'missing-id'))
797
 
        # Note that it returns a body (of '' bzipped).
798
 
        self.assertEqual(
799
 
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
800
 
            request.do_body('\n\n0\n'))
801
 
 
802
 
 
803
 
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
 
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):
804
1378
 
805
1379
    def test_none_argument(self):
806
1380
        backing = self.get_transport()
807
 
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
 
1381
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
808
1382
        tree = self.make_branch_and_memory_tree('.')
809
1383
        tree.lock_write()
810
1384
        tree.add('')
819
1393
        response.body = '\n'.join(sorted(response.body.split('\n')))
820
1394
 
821
1395
        self.assertEqual(
822
 
            SmartServerResponse(('ok', ), '\n'.join(lines)), response)
 
1396
            smart_req.SmartServerResponse(('ok', ), '\n'.join(lines)), response)
823
1397
 
824
1398
    def test_specific_revision_argument(self):
825
1399
        backing = self.get_transport()
826
 
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
 
1400
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
827
1401
        tree = self.make_branch_and_memory_tree('.')
828
1402
        tree.lock_write()
829
1403
        tree.add('')
832
1406
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
833
1407
        tree.unlock()
834
1408
 
835
 
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
 
1409
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), rev_id_utf8),
836
1410
            request.execute('', rev_id_utf8))
837
 
    
 
1411
 
838
1412
    def test_no_such_revision(self):
839
1413
        backing = self.get_transport()
840
 
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
 
1414
        request = smart_repo.SmartServerRepositoryGetRevisionGraph(backing)
841
1415
        tree = self.make_branch_and_memory_tree('.')
842
1416
        tree.lock_write()
843
1417
        tree.add('')
845
1419
        tree.unlock()
846
1420
 
847
1421
        # Note that it still returns body (of zero bytes).
848
 
        self.assertEqual(
849
 
            SmartServerResponse(('nosuchrevision', 'missingrevision', ), ''),
850
 
            request.execute('', 'missingrevision'))
 
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')
851
1525
 
852
1526
 
853
1527
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
855
1529
    def test_missing_revision(self):
856
1530
        """For a missing revision, ('no', ) is returned."""
857
1531
        backing = self.get_transport()
858
 
        request = smart.repository.SmartServerRequestHasRevision(backing)
 
1532
        request = smart_repo.SmartServerRequestHasRevision(backing)
859
1533
        self.make_repository('.')
860
 
        self.assertEqual(SmartServerResponse(('no', )),
 
1534
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
861
1535
            request.execute('', 'revid'))
862
1536
 
863
1537
    def test_present_revision(self):
864
1538
        """For a present revision, ('yes', ) is returned."""
865
1539
        backing = self.get_transport()
866
 
        request = smart.repository.SmartServerRequestHasRevision(backing)
 
1540
        request = smart_repo.SmartServerRequestHasRevision(backing)
867
1541
        tree = self.make_branch_and_memory_tree('.')
868
1542
        tree.lock_write()
869
1543
        tree.add('')
871
1545
        r1 = tree.commit('a commit', rev_id=rev_id_utf8)
872
1546
        tree.unlock()
873
1547
        self.assertTrue(tree.branch.repository.has_revision(rev_id_utf8))
874
 
        self.assertEqual(SmartServerResponse(('yes', )),
 
1548
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
875
1549
            request.execute('', rev_id_utf8))
876
1550
 
877
1551
 
880
1554
    def test_empty_revid(self):
881
1555
        """With an empty revid, we get only size an number and revisions"""
882
1556
        backing = self.get_transport()
883
 
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
 
1557
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
884
1558
        repository = self.make_repository('.')
885
1559
        stats = repository.gather_stats()
886
1560
        expected_body = 'revisions: 0\n'
887
 
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
1561
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
888
1562
                         request.execute('', '', 'no'))
889
1563
 
890
1564
    def test_revid_with_committers(self):
891
1565
        """For a revid we get more infos."""
892
1566
        backing = self.get_transport()
893
1567
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
894
 
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
 
1568
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
895
1569
        tree = self.make_branch_and_memory_tree('.')
896
1570
        tree.lock_write()
897
1571
        tree.add('')
905
1579
        expected_body = ('firstrev: 123456.200 3600\n'
906
1580
                         'latestrev: 654321.400 0\n'
907
1581
                         'revisions: 2\n')
908
 
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
1582
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
909
1583
                         request.execute('',
910
1584
                                         rev_id_utf8, 'no'))
911
1585
 
913
1587
        """For a revid and requesting committers we get the whole thing."""
914
1588
        backing = self.get_transport()
915
1589
        rev_id_utf8 = u'\xc8abc'.encode('utf-8')
916
 
        request = smart.repository.SmartServerRepositoryGatherStats(backing)
 
1590
        request = smart_repo.SmartServerRepositoryGatherStats(backing)
917
1591
        tree = self.make_branch_and_memory_tree('.')
918
1592
        tree.lock_write()
919
1593
        tree.add('')
929
1603
                         'firstrev: 123456.200 3600\n'
930
1604
                         'latestrev: 654321.400 0\n'
931
1605
                         'revisions: 2\n')
932
 
        self.assertEqual(SmartServerResponse(('ok', ), expected_body),
 
1606
        self.assertEqual(smart_req.SmartServerResponse(('ok', ), expected_body),
933
1607
                         request.execute('',
934
1608
                                         rev_id_utf8, 'yes'))
935
1609
 
939
1613
    def test_is_shared(self):
940
1614
        """For a shared repository, ('yes', ) is returned."""
941
1615
        backing = self.get_transport()
942
 
        request = smart.repository.SmartServerRepositoryIsShared(backing)
 
1616
        request = smart_repo.SmartServerRepositoryIsShared(backing)
943
1617
        self.make_repository('.', shared=True)
944
 
        self.assertEqual(SmartServerResponse(('yes', )),
 
1618
        self.assertEqual(smart_req.SmartServerResponse(('yes', )),
945
1619
            request.execute('', ))
946
1620
 
947
1621
    def test_is_not_shared(self):
948
1622
        """For a shared repository, ('no', ) is returned."""
949
1623
        backing = self.get_transport()
950
 
        request = smart.repository.SmartServerRepositoryIsShared(backing)
 
1624
        request = smart_repo.SmartServerRepositoryIsShared(backing)
951
1625
        self.make_repository('.', shared=False)
952
 
        self.assertEqual(SmartServerResponse(('no', )),
 
1626
        self.assertEqual(smart_req.SmartServerResponse(('no', )),
953
1627
            request.execute('', ))
954
1628
 
955
1629
 
956
1630
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
957
1631
 
958
 
    def setUp(self):
959
 
        tests.TestCaseWithMemoryTransport.setUp(self)
960
 
 
961
1632
    def test_lock_write_on_unlocked_repo(self):
962
1633
        backing = self.get_transport()
963
 
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
1634
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
964
1635
        repository = self.make_repository('.', format='knit')
965
1636
        response = request.execute('')
966
1637
        nonce = repository.control_files._lock.peek().get('nonce')
967
 
        self.assertEqual(SmartServerResponse(('ok', nonce)), response)
 
1638
        self.assertEqual(smart_req.SmartServerResponse(('ok', nonce)), response)
968
1639
        # The repository is now locked.  Verify that with a new repository
969
1640
        # object.
970
1641
        new_repo = repository.bzrdir.open_repository()
971
1642
        self.assertRaises(errors.LockContention, new_repo.lock_write)
 
1643
        # Cleanup
 
1644
        request = smart_repo.SmartServerRepositoryUnlock(backing)
 
1645
        response = request.execute('', nonce)
972
1646
 
973
1647
    def test_lock_write_on_locked_repo(self):
974
1648
        backing = self.get_transport()
975
 
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
1649
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
976
1650
        repository = self.make_repository('.', format='knit')
977
 
        repository.lock_write()
 
1651
        repo_token = repository.lock_write().repository_token
978
1652
        repository.leave_lock_in_place()
979
1653
        repository.unlock()
980
1654
        response = request.execute('')
981
1655
        self.assertEqual(
982
 
            SmartServerResponse(('LockContention',)), response)
 
1656
            smart_req.SmartServerResponse(('LockContention',)), response)
 
1657
        # Cleanup
 
1658
        repository.lock_write(repo_token)
 
1659
        repository.dont_leave_lock_in_place()
 
1660
        repository.unlock()
983
1661
 
984
1662
    def test_lock_write_on_readonly_transport(self):
985
1663
        backing = self.get_readonly_transport()
986
 
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
 
1664
        request = smart_repo.SmartServerRepositoryLockWrite(backing)
987
1665
        repository = self.make_repository('.', format='knit')
988
1666
        response = request.execute('')
989
1667
        self.assertFalse(response.is_successful())
990
1668
        self.assertEqual('LockFailed', response.args[0])
991
1669
 
992
1670
 
 
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
 
993
1719
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
994
1720
 
995
1721
    def setUp(self):
997
1723
 
998
1724
    def test_unlock_on_locked_repo(self):
999
1725
        backing = self.get_transport()
1000
 
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
1726
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1001
1727
        repository = self.make_repository('.', format='knit')
1002
 
        token = repository.lock_write()
 
1728
        token = repository.lock_write().repository_token
1003
1729
        repository.leave_lock_in_place()
1004
1730
        repository.unlock()
1005
1731
        response = request.execute('', token)
1006
1732
        self.assertEqual(
1007
 
            SmartServerResponse(('ok',)), response)
 
1733
            smart_req.SmartServerResponse(('ok',)), response)
1008
1734
        # The repository is now unlocked.  Verify that with a new repository
1009
1735
        # object.
1010
1736
        new_repo = repository.bzrdir.open_repository()
1013
1739
 
1014
1740
    def test_unlock_on_unlocked_repo(self):
1015
1741
        backing = self.get_transport()
1016
 
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
1742
        request = smart_repo.SmartServerRepositoryUnlock(backing)
1017
1743
        repository = self.make_repository('.', format='knit')
1018
1744
        response = request.execute('', 'some token')
1019
1745
        self.assertEqual(
1020
 
            SmartServerResponse(('TokenMismatch',)), response)
 
1746
            smart_req.SmartServerResponse(('TokenMismatch',)), response)
1021
1747
 
1022
1748
 
1023
1749
class TestSmartServerIsReadonly(tests.TestCaseWithMemoryTransport):
1024
1750
 
1025
1751
    def test_is_readonly_no(self):
1026
1752
        backing = self.get_transport()
1027
 
        request = smart.request.SmartServerIsReadonly(backing)
 
1753
        request = smart_req.SmartServerIsReadonly(backing)
1028
1754
        response = request.execute()
1029
1755
        self.assertEqual(
1030
 
            SmartServerResponse(('no',)), response)
 
1756
            smart_req.SmartServerResponse(('no',)), response)
1031
1757
 
1032
1758
    def test_is_readonly_yes(self):
1033
1759
        backing = self.get_readonly_transport()
1034
 
        request = smart.request.SmartServerIsReadonly(backing)
 
1760
        request = smart_req.SmartServerIsReadonly(backing)
1035
1761
        response = request.execute()
1036
1762
        self.assertEqual(
1037
 
            SmartServerResponse(('yes',)), response)
 
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))
1038
1854
 
1039
1855
 
1040
1856
class TestHandlers(tests.TestCase):
1044
1860
        """All registered request_handlers can be found."""
1045
1861
        # If there's a typo in a register_lazy call, this loop will fail with
1046
1862
        # an AttributeError.
1047
 
        for key, item in smart.request.request_handlers.iteritems():
 
1863
        for key, item in smart_req.request_handlers.iteritems():
1048
1864
            pass
1049
1865
 
 
1866
    def assertHandlerEqual(self, verb, handler):
 
1867
        self.assertEqual(smart_req.request_handlers.get(verb), handler)
 
1868
 
1050
1869
    def test_registered_methods(self):
1051
1870
        """Test that known methods are registered to the correct object."""
1052
 
        self.assertEqual(
1053
 
            smart.request.request_handlers.get('Branch.get_config_file'),
1054
 
            smart.branch.SmartServerBranchGetConfigFile)
1055
 
        self.assertEqual(
1056
 
            smart.request.request_handlers.get('Branch.lock_write'),
1057
 
            smart.branch.SmartServerBranchRequestLockWrite)
1058
 
        self.assertEqual(
1059
 
            smart.request.request_handlers.get('Branch.last_revision_info'),
1060
 
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
1061
 
        self.assertEqual(
1062
 
            smart.request.request_handlers.get('Branch.revision_history'),
1063
 
            smart.branch.SmartServerRequestRevisionHistory)
1064
 
        self.assertEqual(
1065
 
            smart.request.request_handlers.get('Branch.set_last_revision'),
1066
 
            smart.branch.SmartServerBranchRequestSetLastRevision)
1067
 
        self.assertEqual(
1068
 
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
1069
 
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
1070
 
        self.assertEqual(
1071
 
            smart.request.request_handlers.get('Branch.unlock'),
1072
 
            smart.branch.SmartServerBranchRequestUnlock)
1073
 
        self.assertEqual(
1074
 
            smart.request.request_handlers.get('BzrDir.find_repository'),
1075
 
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
1076
 
        self.assertEqual(
1077
 
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
1078
 
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
1079
 
        self.assertEqual(
1080
 
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
1081
 
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
1082
 
        self.assertEqual(
1083
 
            smart.request.request_handlers.get('BzrDir.open_branch'),
1084
 
            smart.bzrdir.SmartServerRequestOpenBranch)
1085
 
        self.assertEqual(
1086
 
            smart.request.request_handlers.get('Repository.gather_stats'),
1087
 
            smart.repository.SmartServerRepositoryGatherStats)
1088
 
        self.assertEqual(
1089
 
            smart.request.request_handlers.get('Repository.get_parent_map'),
1090
 
            smart.repository.SmartServerRepositoryGetParentMap)
1091
 
        self.assertEqual(
1092
 
            smart.request.request_handlers.get(
1093
 
                'Repository.get_revision_graph'),
1094
 
            smart.repository.SmartServerRepositoryGetRevisionGraph)
1095
 
        self.assertEqual(
1096
 
            smart.request.request_handlers.get('Repository.has_revision'),
1097
 
            smart.repository.SmartServerRequestHasRevision)
1098
 
        self.assertEqual(
1099
 
            smart.request.request_handlers.get('Repository.is_shared'),
1100
 
            smart.repository.SmartServerRepositoryIsShared)
1101
 
        self.assertEqual(
1102
 
            smart.request.request_handlers.get('Repository.lock_write'),
1103
 
            smart.repository.SmartServerRepositoryLockWrite)
1104
 
        self.assertEqual(
1105
 
            smart.request.request_handlers.get('Repository.tarball'),
1106
 
            smart.repository.SmartServerRepositoryTarball)
1107
 
        self.assertEqual(
1108
 
            smart.request.request_handlers.get('Repository.unlock'),
1109
 
            smart.repository.SmartServerRepositoryUnlock)
1110
 
        self.assertEqual(
1111
 
            smart.request.request_handlers.get('Transport.is_readonly'),
1112
 
            smart.request.SmartServerIsReadonly)
 
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/')])