← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_remote.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-05 10:48:03 UTC
  • mto: This revision was merged to the branch mainline in revision 3693.
  • Revision ID: andrew.bennetts@canonical.com-20080905104803-6g72dz6wcldosfs2
Remove monkey-patching of branch._ensure_real from test_remote.py.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_remote.py
494
494
        # unlock
495
495
        client.add_success_response('ok')
496
496
        branch = self.make_remote_branch(transport, client)
497
 
        # This is a hack to work around the problem that RemoteBranch currently
498
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
499
 
        branch._ensure_real = lambda: None
500
497
        branch.lock_write()
501
498
        client._calls = []
502
499
        result = branch.set_revision_history([])
522
519
        # unlock
523
520
        client.add_success_response('ok')
524
521
        branch = self.make_remote_branch(transport, client)
525
 
        # This is a hack to work around the problem that RemoteBranch currently
526
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
527
 
        branch._ensure_real = lambda: None
528
522
        # Lock the branch, reset the record of remote calls.
529
523
        branch.lock_write()
530
524
        client._calls = []
551
545
        client.add_success_response('ok')
552
546
 
553
547
        branch = self.make_remote_branch(transport, client)
554
 
        branch._ensure_real = lambda: None
555
548
        branch.lock_write()
556
549
        client._calls = []
557
550
 
577
570
        client.add_success_response('ok')
578
571
 
579
572
        branch = self.make_remote_branch(transport, client)
580
 
        branch._ensure_real = lambda: None
581
573
        branch.lock_write()
582
574
        self.addCleanup(branch.unlock)
583
575
        client._calls = []
609
601
        client.add_success_response('ok')
610
602
 
611
603
        branch = self.make_remote_branch(transport, client)
612
 
        # This is a hack to work around the problem that RemoteBranch currently
613
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
614
 
        branch._ensure_real = lambda: None
615
604
        # Lock the branch, reset the record of remote calls.
616
605
        branch.lock_write()
617
606
        client._calls = []
637
626
        client.add_success_response('ok')
638
627
 
639
628
        branch = self.make_remote_branch(transport, client)
640
 
        # This is a hack to work around the problem that RemoteBranch currently
641
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
642
 
        branch._ensure_real = lambda: None
643
629
        # Lock the branch, reset the record of remote calls.
644
630
        branch.lock_write()
645
631
        client._calls = []
713
699
        client.add_success_response('ok')
714
700
 
715
701
        branch = self.make_remote_branch(transport, client)
716
 
        # This is a hack to work around the problem that RemoteBranch currently
717
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
718
 
        branch._ensure_real = lambda: None
719
702
        # Lock the branch, reset the record of remote calls.
720
703
        branch.lock_write()
721
704
        client._calls = []
742
725
        client.add_success_response('ok')
743
726
 
744
727
        branch = self.make_remote_branch(transport, client)
745
 
        # This is a hack to work around the problem that RemoteBranch currently
746
 
        # unnecessarily invokes _ensure_real upon a call to lock_write.
747
 
        branch._ensure_real = lambda: None
748
728
        # Lock the branch, reset the record of remote calls.
749
729
        branch.lock_write()
750
730
        self.addCleanup(branch.unlock)