Merge pull request #119 from tgoodlet/test_proc_is_none

Test historic hook with no callback

Author: RonnyPfannschmidt

pluggy/hooks.py

@@ -265,6 +265,8 @@ def call_historic(self, proc=None, kwargs=None):
         self._call_history.append((kwargs or {}, proc))
         # historizing hooks don't return results
         res = self._hookexec(self, self._nonwrappers + self._wrappers, kwargs)
+        if proc is None:
+            return
         for x in res or []:
             proc(x)
 

testing/test_pluginmanager.py

@@ -183,24 +183,46 @@ def he_method1(self, arg):
     assert out == [1, 10, 120, 12]
 
 
-def test_with_result_memorized(pm):
+@pytest.mark.parametrize("result_callback", [True, False])
+def test_with_result_memorized(pm, result_callback):
+    """Verify that ``_HookCaller._maybe_apply_history()`
+    correctly applies the ``result_callback`` function, when provided,
+    to the result from calling each newly registered hook.
+    """
+    out = []
+    if result_callback:
+        def callback(res):
+            out.append(res)
+    else:
+        callback = None
+
     class Hooks(object):
         @hookspec(historic=True)
         def he_method1(self, arg):
             pass
+
     pm.add_hookspecs(Hooks)
 
+    class Plugin1(object):
+        @hookimpl
+        def he_method1(self, arg):
+            return arg * 10
+
+    pm.register(Plugin1())
+
     he_method1 = pm.hook.he_method1
-    he_method1.call_historic(lambda res: out.append(res), dict(arg=1))
-    out = []
+    he_method1.call_historic(proc=callback, kwargs=dict(arg=1))
 
-    class Plugin(object):
+    class Plugin2(object):
         @hookimpl
         def he_method1(self, arg):
             return arg * 10
 
-    pm.register(Plugin())
-    assert out == [10]
+    pm.register(Plugin2())
+    if result_callback:
+        assert out == [10, 10]
+    else:
+        assert out == []
 
 
 def test_with_callbacks_immediately_executed(pm):