← 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: Vincent Ladeuil
  • Date: 2009-07-02 13:07:14 UTC
  • mto: (4524.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4525.
  • Revision ID: v.ladeuil+lp@free.fr-20090702130714-hsyqfusi8vn3a11m
Use tree.has_changes() where appropriate (the test suite caught a
bug in has_changes() (not filtering out the root) in an impressive
number of tests)

* bzrlib/send.py:
(send): Use tree.has_changes() instead of tree.changes_from().

* bzrlib/reconfigure.py:
(Reconfigure._check): Use tree.has_changes() instead of
tree.changes_from().

* bzrlib/merge.py:
(Merger.ensure_revision_trees, Merger.compare_basis): Use
tree.has_changes() instead of tree.changes_from().

* bzrlib/builtins.py:
(cmd_remove_tree.run, cmd_push.run, cmd_merge.run): Use
tree.has_changes() instead of tree.changes_from().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for the smart wire/domain protocol.
18
18
 
29
29
import tarfile
30
30
 
31
31
from bzrlib import (
 
32
    bencode,
32
33
    bzrdir,
33
34
    errors,
34
35
    pack,
38
39
    )
39
40
from bzrlib.branch import Branch, BranchReferenceFormat
40
41
import bzrlib.smart.branch
41
 
import bzrlib.smart.bzrdir
 
42
import bzrlib.smart.bzrdir, bzrlib.smart.bzrdir as smart_dir
 
43
import bzrlib.smart.packrepository
42
44
import bzrlib.smart.repository
43
45
from bzrlib.smart.request import (
44
46
    FailedSmartServerResponse,
47
49
    SuccessfulSmartServerResponse,
48
50
    )
49
51
from bzrlib.tests import (
50
 
    iter_suite_tests,
51
52
    split_suite_by_re,
52
 
    TestScenarioApplier,
53
53
    )
54
54
from bzrlib.transport import chroot, get_transport
55
 
from bzrlib.util import bencode
56
55
 
57
56
 
58
57
def load_tests(standard_tests, module, loader):
59
58
    """Multiply tests version and protocol consistency."""
60
59
    # FindRepository tests.
61
60
    bzrdir_mod = bzrlib.smart.bzrdir
62
 
    applier = TestScenarioApplier()
63
 
    applier.scenarios = [
 
61
    scenarios = [
64
62
        ("find_repository", {
65
63
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV1}),
66
64
        ("find_repositoryV2", {
67
65
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV2}),
 
66
        ("find_repositoryV3", {
 
67
            "_request_class":bzrdir_mod.SmartServerRequestFindRepositoryV3}),
68
68
        ]
69
69
    to_adapt, result = split_suite_by_re(standard_tests,
70
70
        "TestSmartServerRequestFindRepository")
71
71
    v2_only, v1_and_2 = split_suite_by_re(to_adapt,
72
72
        "_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))
 
73
    tests.multiply_tests(v1_and_2, scenarios, result)
 
74
    # The first scenario is only applicable to v1 protocols, it is deleted
 
75
    # since.
 
76
    tests.multiply_tests(v2_only, scenarios[1:], result)
78
77
    return result
79
78
 
80
79
 
160
159
            request.transport_from_client_path('foo/').base)
161
160
 
162
161
 
 
162
class TestSmartServerBzrDirRequestCloningMetaDir(
 
163
    tests.TestCaseWithMemoryTransport):
 
164
    """Tests for BzrDir.cloning_metadir."""
 
165
 
 
166
    def test_cloning_metadir(self):
 
167
        """When there is a bzrdir present, the call succeeds."""
 
168
        backing = self.get_transport()
 
169
        dir = self.make_bzrdir('.')
 
170
        local_result = dir.cloning_metadir()
 
171
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
 
172
        request = request_class(backing)
 
173
        expected = SuccessfulSmartServerResponse(
 
174
            (local_result.network_name(),
 
175
            local_result.repository_format.network_name(),
 
176
            ('branch', local_result.get_branch_format().network_name())))
 
177
        self.assertEqual(expected, request.execute('', 'False'))
 
178
 
 
179
    def test_cloning_metadir_reference(self):
 
180
        """The request fails when bzrdir contains a branch reference."""
 
181
        backing = self.get_transport()
 
182
        referenced_branch = self.make_branch('referenced')
 
183
        dir = self.make_bzrdir('.')
 
184
        local_result = dir.cloning_metadir()
 
185
        reference = BranchReferenceFormat().initialize(dir, referenced_branch)
 
186
        reference_url = BranchReferenceFormat().get_reference(dir)
 
187
        # The server shouldn't try to follow the branch reference, so it's fine
 
188
        # if the referenced branch isn't reachable.
 
189
        backing.rename('referenced', 'moved')
 
190
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
 
191
        request = request_class(backing)
 
192
        expected = FailedSmartServerResponse(('BranchReference',))
 
193
        self.assertEqual(expected, request.execute('', 'False'))
 
194
 
 
195
 
 
196
class TestSmartServerRequestCreateRepository(tests.TestCaseWithMemoryTransport):
 
197
    """Tests for BzrDir.create_repository."""
 
198
 
 
199
    def test_makes_repository(self):
 
200
        """When there is a bzrdir present, the call succeeds."""
 
201
        backing = self.get_transport()
 
202
        self.make_bzrdir('.')
 
203
        request_class = bzrlib.smart.bzrdir.SmartServerRequestCreateRepository
 
204
        request = request_class(backing)
 
205
        reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
206
        reference_format = reference_bzrdir_format.repository_format
 
207
        network_name = reference_format.network_name()
 
208
        expected = SuccessfulSmartServerResponse(
 
209
            ('ok', 'no', 'no', 'no', network_name))
 
210
        self.assertEqual(expected, request.execute('', network_name, 'True'))
 
211
 
 
212
 
163
213
class TestSmartServerRequestFindRepository(tests.TestCaseWithMemoryTransport):
164
214
    """Tests for BzrDir.find_repository."""
165
215
 
172
222
            request.execute(''))
173
223
 
174
224
    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 
 
225
        # nonshared repositorys only allow 'find' to return a handle when the
 
226
        # path the repository is being searched on is the same as that that
177
227
        # the repository is at.
178
228
        backing = self.get_transport()
179
229
        request = self._request_class(backing)
197
247
            subtrees = 'yes'
198
248
        else:
199
249
            subtrees = 'no'
200
 
        if (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
 
250
        if (smart.bzrdir.SmartServerRequestFindRepositoryV3 ==
 
251
            self._request_class):
 
252
            return SuccessfulSmartServerResponse(
 
253
                ('ok', '', rich_root, subtrees, 'no',
 
254
                 repo._format.network_name()))
 
255
        elif (smart.bzrdir.SmartServerRequestFindRepositoryV2 ==
201
256
            self._request_class):
202
257
            # All tests so far are on formats, and for non-external
203
258
            # repositories.
241
296
        self.assertEqual(result, request.execute(''))
242
297
 
243
298
 
 
299
class TestSmartServerBzrDirRequestGetConfigFile(
 
300
    tests.TestCaseWithMemoryTransport):
 
301
    """Tests for BzrDir.get_config_file."""
 
302
 
 
303
    def test_present(self):
 
304
        backing = self.get_transport()
 
305
        dir = self.make_bzrdir('.')
 
306
        dir.get_config().set_default_stack_on("/")
 
307
        local_result = dir._get_config()._get_config_file().read()
 
308
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
 
309
        request = request_class(backing)
 
310
        expected = SuccessfulSmartServerResponse((), local_result)
 
311
        self.assertEqual(expected, request.execute(''))
 
312
 
 
313
    def test_missing(self):
 
314
        backing = self.get_transport()
 
315
        dir = self.make_bzrdir('.')
 
316
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
 
317
        request = request_class(backing)
 
318
        expected = SuccessfulSmartServerResponse((), '')
 
319
        self.assertEqual(expected, request.execute(''))
 
320
 
 
321
 
244
322
class TestSmartServerRequestInitializeBzrDir(tests.TestCaseWithMemoryTransport):
245
323
 
246
324
    def test_empty_dir(self):
250
328
        self.assertEqual(SmartServerResponse(('ok', )),
251
329
            request.execute(''))
252
330
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
253
 
        # no branch, tree or repository is expected with the current 
 
331
        # no branch, tree or repository is expected with the current
254
332
        # default formart.
255
333
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
256
334
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
272
350
            request.execute, 'subdir')
273
351
 
274
352
 
 
353
class TestSmartServerRequestBzrDirInitializeEx(tests.TestCaseWithMemoryTransport):
 
354
    """Basic tests for BzrDir.initialize_ex_1.16 in the smart server.
 
355
 
 
356
    The main unit tests in test_bzrdir exercise the API comprehensively.
 
357
    """
 
358
 
 
359
    def test_empty_dir(self):
 
360
        """Initializing an empty dir should succeed and do it."""
 
361
        backing = self.get_transport()
 
362
        name = self.make_bzrdir('reference')._format.network_name()
 
363
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
364
        self.assertEqual(SmartServerResponse(('', '', '', '', '', '', name,
 
365
            'False', '', '', '')),
 
366
            request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
 
367
            'False'))
 
368
        made_dir = bzrdir.BzrDir.open_from_transport(backing)
 
369
        # no branch, tree or repository is expected with the current
 
370
        # default format.
 
371
        self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
 
372
        self.assertRaises(errors.NotBranchError, made_dir.open_branch)
 
373
        self.assertRaises(errors.NoRepositoryPresent, made_dir.open_repository)
 
374
 
 
375
    def test_missing_dir(self):
 
376
        """Initializing a missing directory should fail like the bzrdir api."""
 
377
        backing = self.get_transport()
 
378
        name = self.make_bzrdir('reference')._format.network_name()
 
379
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
380
        self.assertRaises(errors.NoSuchFile, request.execute, name,
 
381
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
 
382
 
 
383
    def test_initialized_dir(self):
 
384
        """Initializing an extant directory should fail like the bzrdir api."""
 
385
        backing = self.get_transport()
 
386
        name = self.make_bzrdir('reference')._format.network_name()
 
387
        request = smart.bzrdir.SmartServerRequestBzrDirInitializeEx(backing)
 
388
        self.make_bzrdir('subdir')
 
389
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
 
390
            'False', 'False', 'False', '', '', '', '', 'False')
 
391
 
 
392
 
275
393
class TestSmartServerRequestOpenBranch(TestCaseWithChrootedTransport):
276
394
 
277
395
    def test_no_branch(self):
302
420
            request.execute('reference'))
303
421
 
304
422
 
 
423
class TestSmartServerRequestOpenBranchV2(TestCaseWithChrootedTransport):
 
424
 
 
425
    def test_no_branch(self):
 
426
        """When there is no branch, ('nobranch', ) is returned."""
 
427
        backing = self.get_transport()
 
428
        self.make_bzrdir('.')
 
429
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
430
        self.assertEqual(SmartServerResponse(('nobranch', )),
 
431
            request.execute(''))
 
432
 
 
433
    def test_branch(self):
 
434
        """When there is a branch, 'ok' is returned."""
 
435
        backing = self.get_transport()
 
436
        expected = self.make_branch('.')._format.network_name()
 
437
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
438
        self.assertEqual(SuccessfulSmartServerResponse(('branch', expected)),
 
439
            request.execute(''))
 
440
 
 
441
    def test_branch_reference(self):
 
442
        """When there is a branch reference, the reference URL is returned."""
 
443
        backing = self.get_transport()
 
444
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
445
        branch = self.make_branch('branch')
 
446
        checkout = branch.create_checkout('reference',lightweight=True)
 
447
        reference_url = BranchReferenceFormat().get_reference(checkout.bzrdir)
 
448
        self.assertFileEqual(reference_url, 'reference/.bzr/branch/location')
 
449
        self.assertEqual(SuccessfulSmartServerResponse(('ref', reference_url)),
 
450
            request.execute('reference'))
 
451
 
 
452
    def test_stacked_branch(self):
 
453
        """Opening a stacked branch does not open the stacked-on branch."""
 
454
        trunk = self.make_branch('trunk')
 
455
        feature = self.make_branch('feature', format='1.9')
 
456
        feature.set_stacked_on_url(trunk.base)
 
457
        opened_branches = []
 
458
        Branch.hooks.install_named_hook('open', opened_branches.append, None)
 
459
        backing = self.get_transport()
 
460
        request = smart.bzrdir.SmartServerRequestOpenBranchV2(backing)
 
461
        request.setup_jail()
 
462
        try:
 
463
            response = request.execute('feature')
 
464
        finally:
 
465
            request.teardown_jail()
 
466
        expected_format = feature._format.network_name()
 
467
        self.assertEqual(
 
468
            SuccessfulSmartServerResponse(('branch', expected_format)),
 
469
            response)
 
470
        self.assertLength(1, opened_branches)
 
471
 
 
472
 
305
473
class TestSmartServerRequestRevisionHistory(tests.TestCaseWithMemoryTransport):
306
474
 
307
475
    def test_empty(self):
388
556
    def test_with_content(self):
389
557
        # SmartServerBranchGetConfigFile should return the content from
390
558
        # branch.control_files.get('branch.conf') for now - in the future it may
391
 
        # perform more complex processing. 
 
559
        # perform more complex processing.
392
560
        backing = self.get_transport()
393
561
        request = smart.branch.SmartServerBranchGetConfigFile(backing)
394
562
        branch = self.make_branch('.')
397
565
            request.execute(''))
398
566
 
399
567
 
400
 
class SetLastRevisionTestBase(tests.TestCaseWithMemoryTransport):
 
568
class TestLockedBranch(tests.TestCaseWithMemoryTransport):
 
569
 
 
570
    def get_lock_tokens(self, branch):
 
571
        branch_token = branch.lock_write()
 
572
        repo_token = branch.repository.lock_write()
 
573
        branch.repository.unlock()
 
574
        return branch_token, repo_token
 
575
 
 
576
 
 
577
class TestSmartServerBranchRequestSetConfigOption(TestLockedBranch):
 
578
 
 
579
    def test_value_name(self):
 
580
        branch = self.make_branch('.')
 
581
        request = smart.branch.SmartServerBranchRequestSetConfigOption(
 
582
            branch.bzrdir.root_transport)
 
583
        branch_token, repo_token = self.get_lock_tokens(branch)
 
584
        config = branch._get_config()
 
585
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
 
586
            '')
 
587
        self.assertEqual(SuccessfulSmartServerResponse(()), result)
 
588
        self.assertEqual('bar', config.get_option('foo'))
 
589
        # Cleanup
 
590
        branch.unlock()
 
591
 
 
592
    def test_value_name_section(self):
 
593
        branch = self.make_branch('.')
 
594
        request = smart.branch.SmartServerBranchRequestSetConfigOption(
 
595
            branch.bzrdir.root_transport)
 
596
        branch_token, repo_token = self.get_lock_tokens(branch)
 
597
        config = branch._get_config()
 
598
        result = request.execute('', branch_token, repo_token, 'bar', 'foo',
 
599
            'gam')
 
600
        self.assertEqual(SuccessfulSmartServerResponse(()), result)
 
601
        self.assertEqual('bar', config.get_option('foo', 'gam'))
 
602
        # Cleanup
 
603
        branch.unlock()
 
604
 
 
605
 
 
606
class SetLastRevisionTestBase(TestLockedBranch):
401
607
    """Base test case for verbs that implement set_last_revision."""
402
608
 
403
609
    def setUp(self):
407
613
        self.tree = self.make_branch_and_memory_tree('.')
408
614
 
409
615
    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
 
616
        return self.get_lock_tokens(self.tree.branch)
415
617
 
416
618
    def unlock_branch(self):
417
619
        self.tree.branch.unlock()
418
 
        
 
620
 
419
621
    def set_last_revision(self, revision_id, revno):
420
622
        branch_token, repo_token = self.lock_branch()
421
623
        response = self._set_last_revision(
427
629
        response = self.set_last_revision(revision_id, revno)
428
630
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)), response)
429
631
 
430
 
        
 
632
 
431
633
class TestSetLastRevisionVerbMixin(object):
432
634
    """Mixin test case for verbs that implement set_last_revision."""
433
635
 
538
740
        self.assertEqual(
539
741
            SuccessfulSmartServerResponse(('ok', revno, revision_id)),
540
742
            response)
541
 
        
 
743
 
542
744
    def test_branch_last_revision_info_rewind(self):
543
745
        """A branch's tip can be set to a revision that is an ancestor of the
544
746
        current tip, but only if allow_overwrite_descendant is passed.
587
789
        # child-1.
588
790
        new_r2 = self.tree.commit('2nd commit', rev_id='child-2')
589
791
        self.tree.unlock()
590
 
        
 
792
 
591
793
    def test_not_allow_diverged(self):
592
794
        """If allow_diverged is not passed, then setting a divergent history
593
795
        returns a Diverged error.
615
817
        self.assertEqual('child-1', self.tree.branch.last_revision())
616
818
 
617
819
 
 
820
class TestSmartServerBranchRequestGetParent(tests.TestCaseWithMemoryTransport):
 
821
 
 
822
    def test_get_parent_none(self):
 
823
        base_branch = self.make_branch('base')
 
824
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
 
825
        response = request.execute('base')
 
826
        self.assertEquals(
 
827
            SuccessfulSmartServerResponse(('',)), response)
 
828
 
 
829
    def test_get_parent_something(self):
 
830
        base_branch = self.make_branch('base')
 
831
        base_branch.set_parent(self.get_url('foo'))
 
832
        request = smart.branch.SmartServerBranchGetParent(self.get_transport())
 
833
        response = request.execute('base')
 
834
        self.assertEquals(
 
835
            SuccessfulSmartServerResponse(("../foo",)),
 
836
            response)
 
837
 
 
838
 
 
839
class TestSmartServerBranchRequestSetParent(tests.TestCaseWithMemoryTransport):
 
840
 
 
841
    def test_set_parent_none(self):
 
842
        branch = self.make_branch('base', format="1.9")
 
843
        branch.lock_write()
 
844
        branch._set_parent_location('foo')
 
845
        branch.unlock()
 
846
        request = smart.branch.SmartServerBranchRequestSetParentLocation(
 
847
            self.get_transport())
 
848
        branch_token = branch.lock_write()
 
849
        repo_token = branch.repository.lock_write()
 
850
        try:
 
851
            response = request.execute('base', branch_token, repo_token, '')
 
852
        finally:
 
853
            branch.repository.unlock()
 
854
            branch.unlock()
 
855
        self.assertEqual(SuccessfulSmartServerResponse(()), response)
 
856
        self.assertEqual(None, branch.get_parent())
 
857
 
 
858
    def test_set_parent_something(self):
 
859
        branch = self.make_branch('base', format="1.9")
 
860
        request = smart.branch.SmartServerBranchRequestSetParentLocation(
 
861
            self.get_transport())
 
862
        branch_token = branch.lock_write()
 
863
        repo_token = branch.repository.lock_write()
 
864
        try:
 
865
            response = request.execute('base', branch_token, repo_token,
 
866
            'http://bar/')
 
867
        finally:
 
868
            branch.repository.unlock()
 
869
            branch.unlock()
 
870
        self.assertEqual(SuccessfulSmartServerResponse(()), response)
 
871
        self.assertEqual('http://bar/', branch.get_parent())
 
872
 
 
873
 
 
874
class TestSmartServerBranchRequestGetTagsBytes(tests.TestCaseWithMemoryTransport):
 
875
# Only called when the branch format and tags match [yay factory
 
876
# methods] so only need to test straight forward cases.
 
877
 
 
878
    def test_get_bytes(self):
 
879
        base_branch = self.make_branch('base')
 
880
        request = smart.branch.SmartServerBranchGetTagsBytes(
 
881
            self.get_transport())
 
882
        response = request.execute('base')
 
883
        self.assertEquals(
 
884
            SuccessfulSmartServerResponse(('',)), response)
 
885
 
 
886
 
618
887
class TestSmartServerBranchRequestGetStackedOnURL(tests.TestCaseWithMemoryTransport):
619
888
 
620
889
    def test_get_stacked_on_url(self):
650
919
        # with a new branch object.
651
920
        new_branch = repository.bzrdir.open_branch()
652
921
        self.assertRaises(errors.LockContention, new_branch.lock_write)
 
922
        # Cleanup
 
923
        request = smart.branch.SmartServerBranchRequestUnlock(backing)
 
924
        response = request.execute('', branch_nonce, repository_nonce)
653
925
 
654
926
    def test_lock_write_on_locked_branch(self):
655
927
        backing = self.get_transport()
656
928
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
657
929
        branch = self.make_branch('.')
658
 
        branch.lock_write()
 
930
        branch_token = branch.lock_write()
659
931
        branch.leave_lock_in_place()
660
932
        branch.unlock()
661
933
        response = request.execute('')
662
934
        self.assertEqual(
663
935
            SmartServerResponse(('LockContention',)), response)
 
936
        # Cleanup
 
937
        branch.lock_write(branch_token)
 
938
        branch.dont_leave_lock_in_place()
 
939
        branch.unlock()
664
940
 
665
941
    def test_lock_write_with_tokens_on_locked_branch(self):
666
942
        backing = self.get_transport()
676
952
                                   branch_token, repo_token)
677
953
        self.assertEqual(
678
954
            SmartServerResponse(('ok', branch_token, repo_token)), response)
 
955
        # Cleanup
 
956
        branch.repository.lock_write(repo_token)
 
957
        branch.repository.dont_leave_lock_in_place()
 
958
        branch.repository.unlock()
 
959
        branch.lock_write(branch_token)
 
960
        branch.dont_leave_lock_in_place()
 
961
        branch.unlock()
679
962
 
680
963
    def test_lock_write_with_mismatched_tokens_on_locked_branch(self):
681
964
        backing = self.get_transport()
691
974
                                   branch_token+'xxx', repo_token)
692
975
        self.assertEqual(
693
976
            SmartServerResponse(('TokenMismatch',)), response)
 
977
        # Cleanup
 
978
        branch.repository.lock_write(repo_token)
 
979
        branch.repository.dont_leave_lock_in_place()
 
980
        branch.repository.unlock()
 
981
        branch.lock_write(branch_token)
 
982
        branch.dont_leave_lock_in_place()
 
983
        branch.unlock()
694
984
 
695
985
    def test_lock_write_on_locked_repo(self):
696
986
        backing = self.get_transport()
697
987
        request = smart.branch.SmartServerBranchRequestLockWrite(backing)
698
988
        branch = self.make_branch('.', format='knit')
699
 
        branch.repository.lock_write()
700
 
        branch.repository.leave_lock_in_place()
701
 
        branch.repository.unlock()
 
989
        repo = branch.repository
 
990
        repo_token = repo.lock_write()
 
991
        repo.leave_lock_in_place()
 
992
        repo.unlock()
702
993
        response = request.execute('')
703
994
        self.assertEqual(
704
995
            SmartServerResponse(('LockContention',)), response)
 
996
        # Cleanup
 
997
        repo.lock_write(repo_token)
 
998
        repo.dont_leave_lock_in_place()
 
999
        repo.unlock()
705
1000
 
706
1001
    def test_lock_write_on_readonly_transport(self):
707
1002
        backing = self.get_readonly_transport()
766
1061
            '', 'branch token', repo_token)
767
1062
        self.assertEqual(
768
1063
            SmartServerResponse(('TokenMismatch',)), response)
 
1064
        # Cleanup
 
1065
        branch.repository.lock_write(repo_token)
 
1066
        branch.repository.dont_leave_lock_in_place()
 
1067
        branch.repository.unlock()
769
1068
 
770
1069
 
771
1070
class TestSmartServerRepositoryRequest(tests.TestCaseWithMemoryTransport):
794
1093
 
795
1094
        self.assertEqual(None,
796
1095
            request.execute('', 'missing-id'))
797
 
        # Note that it returns a body (of '' bzipped).
 
1096
        # Note that it returns a body that is bzipped.
798
1097
        self.assertEqual(
799
1098
            SuccessfulSmartServerResponse(('ok', ), bz2.compress('')),
800
1099
            request.do_body('\n\n0\n'))
801
1100
 
 
1101
    def test_trivial_include_missing(self):
 
1102
        backing = self.get_transport()
 
1103
        request = smart.repository.SmartServerRepositoryGetParentMap(backing)
 
1104
        tree = self.make_branch_and_memory_tree('.')
 
1105
 
 
1106
        self.assertEqual(None,
 
1107
            request.execute('', 'missing-id', 'include-missing:'))
 
1108
        self.assertEqual(
 
1109
            SuccessfulSmartServerResponse(('ok', ),
 
1110
                bz2.compress('missing:missing-id')),
 
1111
            request.do_body('\n\n0\n'))
 
1112
 
802
1113
 
803
1114
class TestSmartServerRepositoryGetRevisionGraph(tests.TestCaseWithMemoryTransport):
804
1115
 
834
1145
 
835
1146
        self.assertEqual(SmartServerResponse(('ok', ), rev_id_utf8),
836
1147
            request.execute('', rev_id_utf8))
837
 
    
 
1148
 
838
1149
    def test_no_such_revision(self):
839
1150
        backing = self.get_transport()
840
1151
        request = smart.repository.SmartServerRepositoryGetRevisionGraph(backing)
850
1161
            request.execute('', 'missingrevision'))
851
1162
 
852
1163
 
 
1164
class TestSmartServerRepositoryGetRevIdForRevno(tests.TestCaseWithMemoryTransport):
 
1165
 
 
1166
    def test_revno_found(self):
 
1167
        backing = self.get_transport()
 
1168
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1169
        tree = self.make_branch_and_memory_tree('.')
 
1170
        tree.lock_write()
 
1171
        tree.add('')
 
1172
        rev1_id_utf8 = u'\xc8'.encode('utf-8')
 
1173
        rev2_id_utf8 = u'\xc9'.encode('utf-8')
 
1174
        tree.commit('1st commit', rev_id=rev1_id_utf8)
 
1175
        tree.commit('2nd commit', rev_id=rev2_id_utf8)
 
1176
        tree.unlock()
 
1177
 
 
1178
        self.assertEqual(SmartServerResponse(('ok', rev1_id_utf8)),
 
1179
            request.execute('', 1, (2, rev2_id_utf8)))
 
1180
 
 
1181
    def test_known_revid_missing(self):
 
1182
        backing = self.get_transport()
 
1183
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1184
        repo = self.make_repository('.')
 
1185
        self.assertEqual(
 
1186
            FailedSmartServerResponse(('nosuchrevision', 'ghost')),
 
1187
            request.execute('', 1, (2, 'ghost')))
 
1188
 
 
1189
    def test_history_incomplete(self):
 
1190
        backing = self.get_transport()
 
1191
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
 
1192
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
 
1193
        r1 = parent.commit(message='first commit')
 
1194
        r2 = parent.commit(message='second commit')
 
1195
        local = self.make_branch_and_memory_tree('local', format='1.9')
 
1196
        local.branch.pull(parent.branch)
 
1197
        local.set_parent_ids([r2])
 
1198
        r3 = local.commit(message='local commit')
 
1199
        local.branch.create_clone_on_transport(
 
1200
            self.get_transport('stacked'), stacked_on=self.get_url('parent'))
 
1201
        self.assertEqual(
 
1202
            SmartServerResponse(('history-incomplete', 2, r2)),
 
1203
            request.execute('stacked', 1, (3, r3)))
 
1204
 
 
1205
class TestSmartServerRepositoryGetStream(tests.TestCaseWithMemoryTransport):
 
1206
 
 
1207
    def make_two_commit_repo(self):
 
1208
        tree = self.make_branch_and_memory_tree('.')
 
1209
        tree.lock_write()
 
1210
        tree.add('')
 
1211
        r1 = tree.commit('1st commit')
 
1212
        r2 = tree.commit('2nd commit', rev_id=u'\xc8'.encode('utf-8'))
 
1213
        tree.unlock()
 
1214
        repo = tree.branch.repository
 
1215
        return repo, r1, r2
 
1216
 
 
1217
    def test_ancestry_of(self):
 
1218
        """The search argument may be a 'ancestry-of' some heads'."""
 
1219
        backing = self.get_transport()
 
1220
        request = smart.repository.SmartServerRepositoryGetStream(backing)
 
1221
        repo, r1, r2 = self.make_two_commit_repo()
 
1222
        fetch_spec = ['ancestry-of', r2]
 
1223
        lines = '\n'.join(fetch_spec)
 
1224
        request.execute('', repo._format.network_name())
 
1225
        response = request.do_body(lines)
 
1226
        self.assertEqual(('ok',), response.args)
 
1227
        stream_bytes = ''.join(response.body_stream)
 
1228
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
1229
 
 
1230
    def test_search(self):
 
1231
        """The search argument may be a 'search' of some explicit keys."""
 
1232
        backing = self.get_transport()
 
1233
        request = smart.repository.SmartServerRepositoryGetStream(backing)
 
1234
        repo, r1, r2 = self.make_two_commit_repo()
 
1235
        fetch_spec = ['search', '%s %s' % (r1, r2), 'null:', '2']
 
1236
        lines = '\n'.join(fetch_spec)
 
1237
        request.execute('', repo._format.network_name())
 
1238
        response = request.do_body(lines)
 
1239
        self.assertEqual(('ok',), response.args)
 
1240
        stream_bytes = ''.join(response.body_stream)
 
1241
        self.assertStartsWith(stream_bytes, 'Bazaar pack format 1')
 
1242
 
 
1243
 
853
1244
class TestSmartServerRequestHasRevision(tests.TestCaseWithMemoryTransport):
854
1245
 
855
1246
    def test_missing_revision(self):
955
1346
 
956
1347
class TestSmartServerRepositoryLockWrite(tests.TestCaseWithMemoryTransport):
957
1348
 
958
 
    def setUp(self):
959
 
        tests.TestCaseWithMemoryTransport.setUp(self)
960
 
 
961
1349
    def test_lock_write_on_unlocked_repo(self):
962
1350
        backing = self.get_transport()
963
1351
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
969
1357
        # object.
970
1358
        new_repo = repository.bzrdir.open_repository()
971
1359
        self.assertRaises(errors.LockContention, new_repo.lock_write)
 
1360
        # Cleanup
 
1361
        request = smart.repository.SmartServerRepositoryUnlock(backing)
 
1362
        response = request.execute('', nonce)
972
1363
 
973
1364
    def test_lock_write_on_locked_repo(self):
974
1365
        backing = self.get_transport()
975
1366
        request = smart.repository.SmartServerRepositoryLockWrite(backing)
976
1367
        repository = self.make_repository('.', format='knit')
977
 
        repository.lock_write()
 
1368
        repo_token = repository.lock_write()
978
1369
        repository.leave_lock_in_place()
979
1370
        repository.unlock()
980
1371
        response = request.execute('')
981
1372
        self.assertEqual(
982
1373
            SmartServerResponse(('LockContention',)), response)
 
1374
        # Cleanup
 
1375
        repository.lock_write(repo_token)
 
1376
        repository.dont_leave_lock_in_place()
 
1377
        repository.unlock()
983
1378
 
984
1379
    def test_lock_write_on_readonly_transport(self):
985
1380
        backing = self.get_readonly_transport()
990
1385
        self.assertEqual('LockFailed', response.args[0])
991
1386
 
992
1387
 
 
1388
class TestInsertStreamBase(tests.TestCaseWithMemoryTransport):
 
1389
 
 
1390
    def make_empty_byte_stream(self, repo):
 
1391
        byte_stream = smart.repository._stream_to_byte_stream([], repo._format)
 
1392
        return ''.join(byte_stream)
 
1393
 
 
1394
 
 
1395
class TestSmartServerRepositoryInsertStream(TestInsertStreamBase):
 
1396
 
 
1397
    def test_insert_stream_empty(self):
 
1398
        backing = self.get_transport()
 
1399
        request = smart.repository.SmartServerRepositoryInsertStream(backing)
 
1400
        repository = self.make_repository('.')
 
1401
        response = request.execute('', '')
 
1402
        self.assertEqual(None, response)
 
1403
        response = request.do_chunk(self.make_empty_byte_stream(repository))
 
1404
        self.assertEqual(None, response)
 
1405
        response = request.do_end()
 
1406
        self.assertEqual(SmartServerResponse(('ok', )), response)
 
1407
        
 
1408
 
 
1409
class TestSmartServerRepositoryInsertStreamLocked(TestInsertStreamBase):
 
1410
 
 
1411
    def test_insert_stream_empty(self):
 
1412
        backing = self.get_transport()
 
1413
        request = smart.repository.SmartServerRepositoryInsertStreamLocked(
 
1414
            backing)
 
1415
        repository = self.make_repository('.', format='knit')
 
1416
        lock_token = repository.lock_write()
 
1417
        response = request.execute('', '', lock_token)
 
1418
        self.assertEqual(None, response)
 
1419
        response = request.do_chunk(self.make_empty_byte_stream(repository))
 
1420
        self.assertEqual(None, response)
 
1421
        response = request.do_end()
 
1422
        self.assertEqual(SmartServerResponse(('ok', )), response)
 
1423
        repository.unlock()
 
1424
 
 
1425
    def test_insert_stream_with_wrong_lock_token(self):
 
1426
        backing = self.get_transport()
 
1427
        request = smart.repository.SmartServerRepositoryInsertStreamLocked(
 
1428
            backing)
 
1429
        repository = self.make_repository('.', format='knit')
 
1430
        lock_token = repository.lock_write()
 
1431
        self.assertRaises(
 
1432
            errors.TokenMismatch, request.execute, '', '', 'wrong-token')
 
1433
        repository.unlock()
 
1434
 
 
1435
 
993
1436
class TestSmartServerRepositoryUnlock(tests.TestCaseWithMemoryTransport):
994
1437
 
995
1438
    def setUp(self):
1037
1480
            SmartServerResponse(('yes',)), response)
1038
1481
 
1039
1482
 
 
1483
class TestSmartServerRepositorySetMakeWorkingTrees(tests.TestCaseWithMemoryTransport):
 
1484
 
 
1485
    def test_set_false(self):
 
1486
        backing = self.get_transport()
 
1487
        repo = self.make_repository('.', shared=True)
 
1488
        repo.set_make_working_trees(True)
 
1489
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
 
1490
        request = request_class(backing)
 
1491
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
 
1492
            request.execute('', 'False'))
 
1493
        repo = repo.bzrdir.open_repository()
 
1494
        self.assertFalse(repo.make_working_trees())
 
1495
 
 
1496
    def test_set_true(self):
 
1497
        backing = self.get_transport()
 
1498
        repo = self.make_repository('.', shared=True)
 
1499
        repo.set_make_working_trees(False)
 
1500
        request_class = smart.repository.SmartServerRepositorySetMakeWorkingTrees
 
1501
        request = request_class(backing)
 
1502
        self.assertEqual(SuccessfulSmartServerResponse(('ok',)),
 
1503
            request.execute('', 'True'))
 
1504
        repo = repo.bzrdir.open_repository()
 
1505
        self.assertTrue(repo.make_working_trees())
 
1506
 
 
1507
 
1040
1508
class TestSmartServerPackRepositoryAutopack(tests.TestCaseWithTransport):
1041
1509
 
1042
1510
    def make_repo_needing_autopacking(self, path='.'):
1053
1521
 
1054
1522
    def test_autopack_needed(self):
1055
1523
        repo = self.make_repo_needing_autopacking()
 
1524
        repo.lock_write()
 
1525
        self.addCleanup(repo.unlock)
1056
1526
        backing = self.get_transport()
1057
1527
        request = smart.packrepository.SmartServerPackRepositoryAutopack(
1058
1528
            backing)
1060
1530
        self.assertEqual(SmartServerResponse(('ok',)), response)
1061
1531
        repo._pack_collection.reload_pack_names()
1062
1532
        self.assertEqual(1, len(repo._pack_collection.names()))
1063
 
    
 
1533
 
1064
1534
    def test_autopack_not_needed(self):
1065
1535
        tree = self.make_branch_and_tree('.', format='pack-0.92')
1066
1536
        repo = tree.branch.repository
 
1537
        repo.lock_write()
 
1538
        self.addCleanup(repo.unlock)
1067
1539
        for x in range(9):
1068
1540
            tree.commit('commit %s' % x)
1069
1541
        backing = self.get_transport()
1073
1545
        self.assertEqual(SmartServerResponse(('ok',)), response)
1074
1546
        repo._pack_collection.reload_pack_names()
1075
1547
        self.assertEqual(9, len(repo._pack_collection.names()))
1076
 
    
 
1548
 
1077
1549
    def test_autopack_on_nonpack_format(self):
1078
1550
        """A request to autopack a non-pack repo is a no-op."""
1079
1551
        repo = self.make_repository('.', format='knit')
1082
1554
            backing)
1083
1555
        response = request.execute('')
1084
1556
        self.assertEqual(SmartServerResponse(('ok',)), response)
1085
 
        
 
1557
 
1086
1558
 
1087
1559
class TestHandlers(tests.TestCase):
1088
1560
    """Tests for the request.request_handlers object."""
1094
1566
        for key, item in smart.request.request_handlers.iteritems():
1095
1567
            pass
1096
1568
 
 
1569
    def assertHandlerEqual(self, verb, handler):
 
1570
        self.assertEqual(smart.request.request_handlers.get(verb), handler)
 
1571
 
1097
1572
    def test_registered_methods(self):
1098
1573
        """Test that known methods are registered to the correct object."""
1099
 
        self.assertEqual(
1100
 
            smart.request.request_handlers.get('Branch.get_config_file'),
 
1574
        self.assertHandlerEqual('Branch.get_config_file',
1101
1575
            smart.branch.SmartServerBranchGetConfigFile)
1102
 
        self.assertEqual(
1103
 
            smart.request.request_handlers.get('Branch.lock_write'),
 
1576
        self.assertHandlerEqual('Branch.get_parent',
 
1577
            smart.branch.SmartServerBranchGetParent)
 
1578
        self.assertHandlerEqual('Branch.get_tags_bytes',
 
1579
            smart.branch.SmartServerBranchGetTagsBytes)
 
1580
        self.assertHandlerEqual('Branch.lock_write',
1104
1581
            smart.branch.SmartServerBranchRequestLockWrite)
1105
 
        self.assertEqual(
1106
 
            smart.request.request_handlers.get('Branch.last_revision_info'),
 
1582
        self.assertHandlerEqual('Branch.last_revision_info',
1107
1583
            smart.branch.SmartServerBranchRequestLastRevisionInfo)
1108
 
        self.assertEqual(
1109
 
            smart.request.request_handlers.get('Branch.revision_history'),
 
1584
        self.assertHandlerEqual('Branch.revision_history',
1110
1585
            smart.branch.SmartServerRequestRevisionHistory)
1111
 
        self.assertEqual(
1112
 
            smart.request.request_handlers.get('Branch.set_last_revision'),
 
1586
        self.assertHandlerEqual('Branch.set_config_option',
 
1587
            smart.branch.SmartServerBranchRequestSetConfigOption)
 
1588
        self.assertHandlerEqual('Branch.set_last_revision',
1113
1589
            smart.branch.SmartServerBranchRequestSetLastRevision)
1114
 
        self.assertEqual(
1115
 
            smart.request.request_handlers.get('Branch.set_last_revision_info'),
 
1590
        self.assertHandlerEqual('Branch.set_last_revision_info',
1116
1591
            smart.branch.SmartServerBranchRequestSetLastRevisionInfo)
1117
 
        self.assertEqual(
1118
 
            smart.request.request_handlers.get('Branch.unlock'),
 
1592
        self.assertHandlerEqual('Branch.set_last_revision_ex',
 
1593
            smart.branch.SmartServerBranchRequestSetLastRevisionEx)
 
1594
        self.assertHandlerEqual('Branch.set_parent_location',
 
1595
            smart.branch.SmartServerBranchRequestSetParentLocation)
 
1596
        self.assertHandlerEqual('Branch.unlock',
1119
1597
            smart.branch.SmartServerBranchRequestUnlock)
1120
 
        self.assertEqual(
1121
 
            smart.request.request_handlers.get('BzrDir.find_repository'),
 
1598
        self.assertHandlerEqual('BzrDir.find_repository',
1122
1599
            smart.bzrdir.SmartServerRequestFindRepositoryV1)
1123
 
        self.assertEqual(
1124
 
            smart.request.request_handlers.get('BzrDir.find_repositoryV2'),
 
1600
        self.assertHandlerEqual('BzrDir.find_repositoryV2',
1125
1601
            smart.bzrdir.SmartServerRequestFindRepositoryV2)
1126
 
        self.assertEqual(
1127
 
            smart.request.request_handlers.get('BzrDirFormat.initialize'),
 
1602
        self.assertHandlerEqual('BzrDirFormat.initialize',
1128
1603
            smart.bzrdir.SmartServerRequestInitializeBzrDir)
1129
 
        self.assertEqual(
1130
 
            smart.request.request_handlers.get('BzrDir.open_branch'),
 
1604
        self.assertHandlerEqual('BzrDirFormat.initialize_ex_1.16',
 
1605
            smart.bzrdir.SmartServerRequestBzrDirInitializeEx)
 
1606
        self.assertHandlerEqual('BzrDir.cloning_metadir',
 
1607
            smart.bzrdir.SmartServerBzrDirRequestCloningMetaDir)
 
1608
        self.assertHandlerEqual('BzrDir.get_config_file',
 
1609
            smart.bzrdir.SmartServerBzrDirRequestConfigFile)
 
1610
        self.assertHandlerEqual('BzrDir.open_branch',
1131
1611
            smart.bzrdir.SmartServerRequestOpenBranch)
1132
 
        self.assertEqual(
1133
 
            smart.request.request_handlers.get('PackRepository.autopack'),
 
1612
        self.assertHandlerEqual('BzrDir.open_branchV2',
 
1613
            smart.bzrdir.SmartServerRequestOpenBranchV2)
 
1614
        self.assertHandlerEqual('PackRepository.autopack',
1134
1615
            smart.packrepository.SmartServerPackRepositoryAutopack)
1135
 
        self.assertEqual(
1136
 
            smart.request.request_handlers.get('Repository.gather_stats'),
 
1616
        self.assertHandlerEqual('Repository.gather_stats',
1137
1617
            smart.repository.SmartServerRepositoryGatherStats)
1138
 
        self.assertEqual(
1139
 
            smart.request.request_handlers.get('Repository.get_parent_map'),
 
1618
        self.assertHandlerEqual('Repository.get_parent_map',
1140
1619
            smart.repository.SmartServerRepositoryGetParentMap)
1141
 
        self.assertEqual(
1142
 
            smart.request.request_handlers.get(
1143
 
                'Repository.get_revision_graph'),
 
1620
        self.assertHandlerEqual('Repository.get_rev_id_for_revno',
 
1621
            smart.repository.SmartServerRepositoryGetRevIdForRevno)
 
1622
        self.assertHandlerEqual('Repository.get_revision_graph',
1144
1623
            smart.repository.SmartServerRepositoryGetRevisionGraph)
1145
 
        self.assertEqual(
1146
 
            smart.request.request_handlers.get('Repository.has_revision'),
 
1624
        self.assertHandlerEqual('Repository.get_stream',
 
1625
            smart.repository.SmartServerRepositoryGetStream)
 
1626
        self.assertHandlerEqual('Repository.has_revision',
1147
1627
            smart.repository.SmartServerRequestHasRevision)
1148
 
        self.assertEqual(
1149
 
            smart.request.request_handlers.get('Repository.is_shared'),
 
1628
        self.assertHandlerEqual('Repository.insert_stream',
 
1629
            smart.repository.SmartServerRepositoryInsertStream)
 
1630
        self.assertHandlerEqual('Repository.insert_stream_locked',
 
1631
            smart.repository.SmartServerRepositoryInsertStreamLocked)
 
1632
        self.assertHandlerEqual('Repository.is_shared',
1150
1633
            smart.repository.SmartServerRepositoryIsShared)
1151
 
        self.assertEqual(
1152
 
            smart.request.request_handlers.get('Repository.lock_write'),
 
1634
        self.assertHandlerEqual('Repository.lock_write',
1153
1635
            smart.repository.SmartServerRepositoryLockWrite)
1154
 
        self.assertEqual(
1155
 
            smart.request.request_handlers.get('Repository.tarball'),
 
1636
        self.assertHandlerEqual('Repository.tarball',
1156
1637
            smart.repository.SmartServerRepositoryTarball)
1157
 
        self.assertEqual(
1158
 
            smart.request.request_handlers.get('Repository.unlock'),
 
1638
        self.assertHandlerEqual('Repository.unlock',
1159
1639
            smart.repository.SmartServerRepositoryUnlock)
1160
 
        self.assertEqual(
1161
 
            smart.request.request_handlers.get('Transport.is_readonly'),
 
1640
        self.assertHandlerEqual('Transport.is_readonly',
1162
1641
            smart.request.SmartServerIsReadonly)