/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_smart.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:37 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005237-59jdqykbfjo1p37t
Rename make_bzrdir to make_controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_smart.py
199
199
    def test_cloning_metadir(self):
200
200
        """When there is a bzrdir present, the call succeeds."""
201
201
        backing = self.get_transport()
202
 
        dir = self.make_bzrdir('.')
 
202
        dir = self.make_controldir('.')
203
203
        local_result = dir.cloning_metadir()
204
204
        request_class = smart_dir.SmartServerBzrDirRequestCloningMetaDir
205
205
        request = request_class(backing)
213
213
        """The request fails when bzrdir contains a branch reference."""
214
214
        backing = self.get_transport()
215
215
        referenced_branch = self.make_branch('referenced')
216
 
        dir = self.make_bzrdir('.')
 
216
        dir = self.make_controldir('.')
217
217
        local_result = dir.cloning_metadir()
218
218
        reference = _mod_bzrbranch.BranchReferenceFormat().initialize(
219
219
            dir, target_branch=referenced_branch)
271
271
    def test_destroy_branch_missing(self):
272
272
        """An error is raised if the branch didn't exist."""
273
273
        backing = self.get_transport()
274
 
        dir = self.make_bzrdir('.', format="development-colo")
 
274
        dir = self.make_controldir('.', format="development-colo")
275
275
        request_class = smart_dir.SmartServerBzrDirRequestDestroyBranch
276
276
        request = request_class(backing)
277
277
        expected = smart_req.FailedSmartServerResponse(('nobranch',), None)
294
294
    def test_has_workingtree_no(self):
295
295
        """A working tree is missing."""
296
296
        backing = self.get_transport()
297
 
        dir = self.make_bzrdir('.')
 
297
        dir = self.make_controldir('.')
298
298
        request_class = smart_dir.SmartServerBzrDirRequestHasWorkingTree
299
299
        request = request_class(backing)
300
300
        expected = smart_req.SuccessfulSmartServerResponse(('no',))
317
317
    def test_destroy_repository_missing(self):
318
318
        """An error is raised if the repository didn't exist."""
319
319
        backing = self.get_transport()
320
 
        dir = self.make_bzrdir('.')
 
320
        dir = self.make_controldir('.')
321
321
        request_class = smart_dir.SmartServerBzrDirRequestDestroyRepository
322
322
        request = request_class(backing)
323
323
        expected = smart_req.FailedSmartServerResponse(
331
331
    def test_makes_repository(self):
332
332
        """When there is a bzrdir present, the call succeeds."""
333
333
        backing = self.get_transport()
334
 
        self.make_bzrdir('.')
 
334
        self.make_controldir('.')
335
335
        request_class = smart_dir.SmartServerRequestCreateRepository
336
336
        request = request_class(backing)
337
337
        reference_bzrdir_format = controldir.format_registry.get('pack-0.92')()
349
349
        """When there is no repository to be found, ('norepository', ) is returned."""
350
350
        backing = self.get_transport()
351
351
        request = self._request_class(backing)
352
 
        self.make_bzrdir('.')
 
352
        self.make_controldir('.')
353
353
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
354
354
            request.execute(''))
355
355
 
361
361
        request = self._request_class(backing)
362
362
        result = self._make_repository_and_result()
363
363
        self.assertEqual(result, request.execute(''))
364
 
        self.make_bzrdir('subdir')
 
364
        self.make_controldir('subdir')
365
365
        self.assertEqual(smart_req.SmartServerResponse(('norepository', )),
366
366
            request.execute('subdir'))
367
367
 
404
404
        request = self._request_class(backing)
405
405
        result = self._make_repository_and_result(shared=True)
406
406
        self.assertEqual(result, request.execute(''))
407
 
        self.make_bzrdir('subdir')
 
407
        self.make_controldir('subdir')
408
408
        result2 = smart_req.SmartServerResponse(
409
409
            result.args[0:1] + ('..', ) + result.args[2:])
410
410
        self.assertEqual(result2,
411
411
            request.execute('subdir'))
412
 
        self.make_bzrdir('subdir/deeper')
 
412
        self.make_controldir('subdir/deeper')
413
413
        result3 = smart_req.SmartServerResponse(
414
414
            result.args[0:1] + ('../..', ) + result.args[2:])
415
415
        self.assertEqual(result3,
443
443
 
444
444
    def test_present(self):
445
445
        backing = self.get_transport()
446
 
        dir = self.make_bzrdir('.')
 
446
        dir = self.make_controldir('.')
447
447
        dir.get_config().set_default_stack_on("/")
448
448
        local_result = dir._get_config()._get_config_file().read()
449
449
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
453
453
 
454
454
    def test_missing(self):
455
455
        backing = self.get_transport()
456
 
        dir = self.make_bzrdir('.')
 
456
        dir = self.make_controldir('.')
457
457
        request_class = smart_dir.SmartServerBzrDirRequestConfigFile
458
458
        request = request_class(backing)
459
459
        expected = smart_req.SuccessfulSmartServerResponse((), '')
477
477
 
478
478
    def test_empty(self):
479
479
        backing = self.get_transport()
480
 
        dir = self.make_bzrdir('.')
 
480
        dir = self.make_controldir('.')
481
481
        request_class = smart_dir.SmartServerBzrDirRequestGetBranches
482
482
        request = request_class(backing)
483
483
        local_result = bencode.bencode({})
512
512
        """Initializing an extant bzrdir should fail like the bzrdir api."""
513
513
        backing = self.get_transport()
514
514
        request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
515
 
        self.make_bzrdir('subdir')
 
515
        self.make_controldir('subdir')
516
516
        self.assertRaises(errors.AlreadyControlDirError,
517
517
            request.execute, 'subdir')
518
518
 
527
527
    def test_empty_dir(self):
528
528
        """Initializing an empty dir should succeed and do it."""
529
529
        backing = self.get_transport()
530
 
        name = self.make_bzrdir('reference')._format.network_name()
 
530
        name = self.make_controldir('reference')._format.network_name()
531
531
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
532
532
        self.assertEqual(
533
533
            smart_req.SmartServerResponse(('', '', '', '', '', '', name,
544
544
    def test_missing_dir(self):
545
545
        """Initializing a missing directory should fail like the bzrdir api."""
546
546
        backing = self.get_transport()
547
 
        name = self.make_bzrdir('reference')._format.network_name()
 
547
        name = self.make_controldir('reference')._format.network_name()
548
548
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
549
549
        self.assertRaises(errors.NoSuchFile, request.execute, name,
550
550
            'subdir/dir', 'False', 'False', 'False', '', '', '', '', 'False')
552
552
    def test_initialized_dir(self):
553
553
        """Initializing an extant directory should fail like the bzrdir api."""
554
554
        backing = self.get_transport()
555
 
        name = self.make_bzrdir('reference')._format.network_name()
 
555
        name = self.make_controldir('reference')._format.network_name()
556
556
        request = smart_dir.SmartServerRequestBzrDirInitializeEx(backing)
557
 
        self.make_bzrdir('subdir')
 
557
        self.make_controldir('subdir')
558
558
        self.assertRaises(errors.FileExists, request.execute, name, 'subdir',
559
559
            'False', 'False', 'False', '', '', '', '', 'False')
560
560
 
600
600
    def test_present_without_workingtree(self):
601
601
        backing = self.get_transport()
602
602
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
603
 
        self.make_bzrdir('.')
 
603
        self.make_controldir('.')
604
604
        self.assertEqual(smart_req.SmartServerResponse(('yes', 'no')),
605
605
            request.execute(''))
606
606
 
618
618
        self.vfs_transport_factory = test_server.LocalURLServer
619
619
        backing = self.get_transport()
620
620
        request = smart_dir.SmartServerRequestOpenBzrDir_2_1(backing)
621
 
        bd = self.make_bzrdir('.')
 
621
        bd = self.make_controldir('.')
622
622
        bd.create_repository()
623
623
        bd.create_branch()
624
624
        bd.create_workingtree()
632
632
        """When there is no branch, ('nobranch', ) is returned."""
633
633
        backing = self.get_transport()
634
634
        request = smart_dir.SmartServerRequestOpenBranch(backing)
635
 
        self.make_bzrdir('.')
 
635
        self.make_controldir('.')
636
636
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
637
637
            request.execute(''))
638
638
 
671
671
    def test_no_branch(self):
672
672
        """When there is no branch, ('nobranch', ) is returned."""
673
673
        backing = self.get_transport()
674
 
        self.make_bzrdir('.')
 
674
        self.make_controldir('.')
675
675
        request = smart_dir.SmartServerRequestOpenBranchV2(backing)
676
676
        self.assertEqual(smart_req.SmartServerResponse(('nobranch', )),
677
677
            request.execute(''))
734
734
    def test_no_branch(self):
735
735
        """When there is no branch, ('nobranch', ) is returned."""
736
736
        backing = self.get_transport()
737
 
        self.make_bzrdir('.')
 
737
        self.make_controldir('.')
738
738
        request = smart_dir.SmartServerRequestOpenBranchV3(backing)
739
739
        self.assertEqual(smart_req.SmartServerResponse(('nobranch',)),
740
740
            request.execute(''))
824
824
        """When there is a bzrdir and no branch, NotBranchError is raised."""
825
825
        backing = self.get_transport()
826
826
        request = smart_branch.SmartServerBranchRequest(backing)
827
 
        self.make_bzrdir('.')
 
827
        self.make_controldir('.')
828
828
        self.assertRaises(errors.NotBranchError,
829
829
            request.execute, '')
830
830
 
1564
1564
        backing = self.get_transport()
1565
1565
        request = smart_repo.SmartServerRepositoryRequest(backing)
1566
1566
        self.make_repository('.', shared=True)
1567
 
        self.make_bzrdir('subdir')
 
1567
        self.make_controldir('subdir')
1568
1568
        self.assertRaises(errors.NoRepositoryPresent,
1569
1569
            request.execute, 'subdir')
1570
1570