Merge pull request #16 from vodik/fix-memorized

Improve historic hook callbacks

Author: hpk42

pluggy.py

@@ -747,7 +747,9 @@ def __call__(self, **kwargs):
     def call_historic(self, proc=None, kwargs=None):
         self._call_history.append((kwargs or {}, proc))
         # historizing hooks don't return results
-        self._hookexec(self, self._nonwrappers + self._wrappers, kwargs)
+        res = self._hookexec(self, self._nonwrappers + self._wrappers, kwargs)
+        if res and proc is not None:
+            proc(res[0])
 
     def call_extra(self, methods, kwargs):
         """ Call the hook with some additional temporarily participating

testing/test_pluggy.py

@@ -212,6 +212,25 @@ def he_method1(self, arg):
         pm.register(Plugin())
         assert l == [10]
 
+    def test_with_immediate_result_memorized(self, pm):
+        class Hooks:
+            @hookspec(historic=True)
+            def he_method1(self, arg):
+                pass
+        pm.add_hookspecs(Hooks)
+
+        class Plugin:
+            @hookimpl
+            def he_method1(self, arg):
+                return arg * 10
+
+        l = []
+        pm.register(Plugin())
+
+        he_method1 = pm.hook.he_method1
+        he_method1.call_historic(lambda res: l.append(res), dict(arg=1))
+        assert l == [10]
+
     def test_register_historic_incompat_hookwrapper(self, pm):
         class Hooks:
             @hookspec(historic=True)