← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

merge hpss again; restore incorrectly removed RemoteRepository.break_lock

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
140
140
        self._calls.append(('call', method, args))
141
141
        return self.responses.pop(0)[0]
142
142
 
143
 
    def call2(self, method, *args):
144
 
        self._calls.append(('call2', method, args))
 
143
    def call_expecting_body(self, method, *args):
 
144
        self._calls.append(('call_expecting_body', method, args))
145
145
        result = self.responses.pop(0)
146
146
        return result[0], FakeProtocol(result[1])
147
147
 
345
345
        branch = RemoteBranch(bzrdir, None, _client=client)
346
346
        result = branch.control_files.get('branch.conf')
347
347
        self.assertEqual(
348
 
            [('call2', 'Branch.get_config_file', ('///quack/',))],
 
348
            [('call_expecting_body', 'Branch.get_config_file', ('///quack/',))],
349
349
            client._calls)
350
350
        self.assertEqual('config file body', result.read())
351
351
 
403
403
            responses, transport_path)
404
404
        result = repo.gather_stats(None)
405
405
        self.assertEqual(
406
 
            [('call2', 'Repository.gather_stats', ('///quack/','','no'))],
 
406
            [('call_expecting_body', 'Repository.gather_stats',
 
407
             ('///quack/','','no'))],
407
408
            client._calls)
408
409
        self.assertEqual({'revisions': 2, 'size': 18}, result)
409
410
 
420
421
            responses, transport_path)
421
422
        result = repo.gather_stats(revid)
422
423
        self.assertEqual(
423
 
            [('call2', 'Repository.gather_stats',
 
424
            [('call_expecting_body', 'Repository.gather_stats',
424
425
              ('///quick/', revid, 'no'))],
425
426
            client._calls)
426
427
        self.assertEqual({'revisions': 2, 'size': 18,
442
443
            responses, transport_path)
443
444
        result = repo.gather_stats(revid, True)
444
445
        self.assertEqual(
445
 
            [('call2', 'Repository.gather_stats',
 
446
            [('call_expecting_body', 'Repository.gather_stats',
446
447
              ('///buick/', revid, 'yes'))],
447
448
            client._calls)
448
449
        self.assertEqual({'revisions': 2, 'size': 18,
478
479
            responses, transport_path)
479
480
        result = repo.get_revision_graph()
480
481
        self.assertEqual(
481
 
            [('call2', 'Repository.get_revision_graph', ('///sinhala/', ''))],
 
482
            [('call_expecting_body', 'Repository.get_revision_graph',
 
483
             ('///sinhala/', ''))],
482
484
            client._calls)
483
485
        self.assertEqual({r1: [], r2: [r1]}, result)
484
486
 
497
499
            responses, transport_path)
498
500
        result = repo.get_revision_graph(r2)
499
501
        self.assertEqual(
500
 
            [('call2', 'Repository.get_revision_graph', ('///sinhala/', r2))],
 
502
            [('call_expecting_body', 'Repository.get_revision_graph',
 
503
             ('///sinhala/', r2))],
501
504
            client._calls)
502
505
        self.assertEqual({r11: [], r12: [], r2: [r11, r12], }, result)
503
506
 
511
514
        self.assertRaises(errors.NoSuchRevision,
512
515
            repo.get_revision_graph, revid)
513
516
        self.assertEqual(
514
 
            [('call2', 'Repository.get_revision_graph', ('///sinhala/', revid))],
 
517
            [('call_expecting_body', 'Repository.get_revision_graph',
 
518
             ('///sinhala/', revid))],
515
519
            client._calls)
516
520
 
517
521
        
631
635
        transport_path = 'repo'
632
636
        expected_responses = [(('ok',), self.tarball_content),
633
637
            ]
634
 
        expected_calls = [('call2', 'Repository.tarball', ('///repo/', 'bz2',),),
 
638
        expected_calls = [('call_expecting_body', 'Repository.tarball',
 
639
                           ('///repo/', 'bz2',),),
635
640
            ]
636
641
        remote_repo, client = self.setup_fake_client_and_repository(
637
642
            expected_responses, transport_path)