/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 bzrlib/tests/blackbox/test_branch.py

Merge require_testtools_0.9.5_for_selftest to reflect test requirment and resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branch.py
414
414
        # being too low. If rpc_count increases, more network roundtrips have
415
415
        # become necessary for this use case. Please do not adjust this number
416
416
        # upwards without agreement from bzr's network support maintainers.
417
 
        self.assertLength(38, self.hpss_calls)
 
417
        self.assertLength(37, self.hpss_calls)
418
418
 
419
419
    def test_branch_from_trivial_branch_streaming_acceptance(self):
420
420
        self.setup_smart_server_with_call_log()
429
429
        # being too low. If rpc_count increases, more network roundtrips have
430
430
        # become necessary for this use case. Please do not adjust this number
431
431
        # upwards without agreement from bzr's network support maintainers.
432
 
        self.assertLength(10, self.hpss_calls)
 
432
        self.assertLength(9, self.hpss_calls)
433
433
 
434
434
    def test_branch_from_trivial_stacked_branch_streaming_acceptance(self):
435
435
        self.setup_smart_server_with_call_log()
449
449
        # being too low. If rpc_count increases, more network roundtrips have
450
450
        # become necessary for this use case. Please do not adjust this number
451
451
        # upwards without agreement from bzr's network support maintainers.
452
 
        self.assertLength(15, self.hpss_calls)
 
452
        self.assertLength(14, self.hpss_calls)
453
453
 
454
454
 
455
455
class TestRemoteBranch(TestCaseWithSFTPServer):