Rev 5744: (jelmer) Reset lazy hooks between test runs. (Jelmer Vernooij) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 5744 [merge]
revision-id: pqm at pqm.ubuntu.com-20110330131515-22rogl3u22r21tym
parent: pqm at pqm.ubuntu.com-20110328161032-1a2n8l4z60xsvo50
parent: jelmer at samba.org-20110330122406-h18k96eqvockf4bi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-03-30 13:15:15 +0000
message:
  (jelmer) Reset lazy hooks between test runs. (Jelmer Vernooij)
modified:
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_hooks.py     test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py	2011-03-14 12:18:38 +0000
+++ b/bzrlib/tests/__init__.py	2011-03-30 10:54:24 +0000
@@ -1000,6 +1000,8 @@
         for key, (parent, name) in known_hooks.iter_parent_objects():
             current_hooks = getattr(parent, name)
             self._preserved_hooks[parent] = (name, current_hooks)
+        self._preserved_lazy_hooks = hooks._lazy_hooks
+        hooks._lazy_hooks = {}
         self.addCleanup(self._restoreHooks)
         for key, (parent, name) in known_hooks.iter_parent_objects():
             factory = known_hooks.get(key)
@@ -1657,6 +1659,7 @@
     def _restoreHooks(self):
         for klass, (name, hooks) in self._preserved_hooks.items():
             setattr(klass, name, hooks)
+        hooks._lazy_hooks = self._preserved_lazy_hooks
 
     def knownFailure(self, reason):
         """This test has failed for some known reason."""

=== modified file 'bzrlib/tests/test_hooks.py'
--- a/bzrlib/tests/test_hooks.py	2011-01-23 00:24:17 +0000
+++ b/bzrlib/tests/test_hooks.py	2011-03-30 12:24:06 +0000
@@ -19,6 +19,7 @@
 from bzrlib import (
     branch,
     errors,
+    hooks as _mod_hooks,
     pyutils,
     tests,
     )
@@ -29,7 +30,6 @@
     known_hooks,
     known_hooks_key_to_object,
     known_hooks_key_to_parent_and_attribute,
-    _lazy_hooks,
     )
 from bzrlib.symbol_versioning import (
     deprecated_in,
@@ -124,7 +124,7 @@
         set_rh = lambda: None
         install_lazy_named_hook('bzrlib.tests.test_hooks',
             'TestHooks.hooks', 'set_rh', set_rh, "demo")
-        set_rh_lazy_hooks = _lazy_hooks[
+        set_rh_lazy_hooks = _mod_hooks._lazy_hooks[
             ('bzrlib.tests.test_hooks', 'TestHooks.hooks', 'set_rh')]
         self.assertEquals(1, len(set_rh_lazy_hooks))
         self.assertEquals(set_rh, set_rh_lazy_hooks[0][0].get_obj())
@@ -153,7 +153,7 @@
     def test_valid_lazy_hooks(self):
         # Make sure that all the registered lazy hooks are referring to existing
         # hook points which allow lazy registration.
-        for key, callbacks in _lazy_hooks.iteritems():
+        for key, callbacks in _mod_hooks._lazy_hooks.iteritems():
             (module_name, member_name, hook_name) = key
             obj = pyutils.get_named_object(module_name, member_name)
             self.assertEquals(obj._module, module_name)

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-03-28 15:17:09 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-03-30 10:54:24 +0000
@@ -42,6 +42,8 @@
 .. Fixes for situations where bzr would previously crash or give incorrect
    or undesirable results.
 
+ * Lazy hooks are now reset between test runs. (Jelmer Vernooij, #745566)
+
 Documentation
 *************