← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/__init__.py

merge hpss again; restore incorrectly removed RemoteRepository.break_lock

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/__init__.py
753
753
        self._benchtime = None
754
754
        # prevent hooks affecting tests
755
755
        self._preserved_hooks = {
756
 
            bzrlib.branch.Branch:bzrlib.branch.Branch.hooks,
757
 
            bzrlib.smart.server.SmartTCPServer:bzrlib.smart.server.SmartTCPServer.hooks,
 
756
            bzrlib.branch.Branch: bzrlib.branch.Branch.hooks,
 
757
            bzrlib.smart.server.SmartTCPServer: bzrlib.smart.server.SmartTCPServer.hooks,
758
758
            }
759
759
        self.addCleanup(self._restoreHooks)
760
 
        # this list of hooks must be kept in sync with the defaults
761
 
        # in branch.py
 
760
        # reset all hooks to an empty instance of the appropriate type
762
761
        bzrlib.branch.Branch.hooks = bzrlib.branch.BranchHooks()
 
762
        bzrlib.smart.server.SmartTCPServer.hooks = bzrlib.smart.server.SmartServerHooks()
 
763
        # FIXME: 
763
764
 
764
765
    def _silenceUI(self):
765
766
        """Turn off UI for duration of test"""