~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

Merge from bzr.dev, resolving conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
324
324
    def test_installed_hooks_are_BranchHooks(self):
325
325
        """The installed hooks object should be a BranchHooks."""
326
326
        # the installed hooks are saved in self._preserved_hooks.
327
 
        self.assertIsInstance(self._preserved_hooks, BranchHooks)
 
327
        self.assertIsInstance(self._preserved_hooks[_mod_branch.Branch], BranchHooks)
328
328
 
329
329
    def test_install_hook_raises_unknown_hook(self):
330
330
        """install_hook should raise UnknownHook if a hook is unknown."""