← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_selftest.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_selftest.py
1179
1179
        """The bzrlib hooks should be sanitised by setUp."""
1180
1180
        self.assertEqual(bzrlib.branch.BranchHooks(),
1181
1181
            bzrlib.branch.Branch.hooks)
 
1182
        self.assertEqual(bzrlib.smart.server.SmartServerHooks(),
 
1183
            bzrlib.smart.server.SmartTCPServer.hooks)
1182
1184
 
1183
1185
    def test__gather_lsprof_in_benchmarks(self):
1184
1186
        """When _gather_lsprof_in_benchmarks is on, accumulate profile data.