1 files changed, 121 insertions, 11 deletions
diff --git a/mediagoblin/tests/test_pluginapi.py b/mediagoblin/tests/test_pluginapi.py
index 315a95da..d40a5081 100644
--- a/mediagoblin/tests/test_pluginapi.py
+++ b/mediagoblin/tests/test_pluginapi.py
@@ -15,11 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import sys
+
 from configobj import ConfigObj
+import pytest
+
 from mediagoblin import mg_globals
 from mediagoblin.init.plugins import setup_plugins
 from mediagoblin.tools import pluginapi
-from nose.tools import eq_
 
 
 def with_cleanup(*modules_to_delete):
@@ -97,7 +99,7 @@ def test_no_plugins():
     setup_plugins()
 
     # Make sure we didn't load anything.
-    eq_(len(pman.plugins), 0)
+    assert len(pman.plugins) == 0
 
 
 @with_cleanup('mediagoblin.plugins.sampleplugin')
@@ -117,14 +119,14 @@ def test_one_plugin():
     setup_plugins()
 
     # Make sure we only found one plugin
-    eq_(len(pman.plugins), 1)
+    assert len(pman.plugins) == 1
     # Make sure the plugin is the one we think it is.
-    eq_(pman.plugins[0], 'mediagoblin.plugins.sampleplugin')
+    assert pman.plugins[0] == 'mediagoblin.plugins.sampleplugin'
     # Make sure there was one hook registered
-    eq_(len(pman.hooks), 1)
+    assert len(pman.hooks) == 1
     # Make sure _setup_plugin_called was called once
     import mediagoblin.plugins.sampleplugin
-    eq_(mediagoblin.plugins.sampleplugin._setup_plugin_called, 1)
+    assert mediagoblin.plugins.sampleplugin._setup_plugin_called == 1
 
 
 @with_cleanup('mediagoblin.plugins.sampleplugin')
@@ -145,14 +147,14 @@ def test_same_plugin_twice():
     setup_plugins()
 
     # Make sure we only found one plugin
-    eq_(len(pman.plugins), 1)
+    assert len(pman.plugins) == 1
     # Make sure the plugin is the one we think it is.
-    eq_(pman.plugins[0], 'mediagoblin.plugins.sampleplugin')
+    assert pman.plugins[0] == 'mediagoblin.plugins.sampleplugin'
     # Make sure there was one hook registered
-    eq_(len(pman.hooks), 1)
+    assert len(pman.hooks) == 1
     # Make sure _setup_plugin_called was called once
     import mediagoblin.plugins.sampleplugin
-    eq_(mediagoblin.plugins.sampleplugin._setup_plugin_called, 1)
+    assert mediagoblin.plugins.sampleplugin._setup_plugin_called == 1
 
 
 @with_cleanup()
@@ -172,4 +174,112 @@ def test_disabled_plugin():
     setup_plugins()
 
     # Make sure we didn't load the plugin
-    eq_(len(pman.plugins), 0)
+    assert len(pman.plugins) == 0
+
+
+@with_cleanup()
+def test_callable_runone():
+    """
+    Test the callable_runone method
+    """
+    cfg = build_config([
+            ('mediagoblin', {}, []),
+            ('plugins', {}, [
+                    ('mediagoblin.tests.testplugins.callables1', {}, []),
+                    ('mediagoblin.tests.testplugins.callables2', {}, []),
+                    ('mediagoblin.tests.testplugins.callables3', {}, []),
+                    ])
+            ])
+
+    mg_globals.app_config = cfg['mediagoblin']
+    mg_globals.global_config = cfg
+
+    setup_plugins()
+
+    # Just one hook provided
+    call_log = []
+    assert pluginapi.callable_runone(
+        "just_one", call_log) == "Called just once"
+    assert call_log == ["expect this one call"]
+
+    # Nothing provided and unhandled not okay
+    call_log = []
+    with pytest.raises(pluginapi.UnhandledCallable):
+        pluginapi.callable_runone(
+            "nothing_handling", call_log)
+    assert call_log == []
+
+    # Nothing provided and unhandled okay
+    call_log = []
+    assert pluginapi.callable_runone(
+        "nothing_handling", call_log, unhandled_okay=True) is None
+    assert call_log == []
+    
+    # Multiple provided, go with the first!
+    call_log = []
+    assert pluginapi.callable_runone(
+        "multi_handle", call_log) == "the first returns"
+    assert call_log == ["Hi, I'm the first"]
+
+    # Multiple provided, one has CantHandleIt
+    call_log = []
+    assert pluginapi.callable_runone(
+        "multi_handle_with_canthandle",
+        call_log) == "the second returns"
+    assert call_log == ["Hi, I'm the second"]
+
+
+@with_cleanup()
+def test_callable_runall():
+    """
+    Test the callable_runall method
+    """
+    cfg = build_config([
+            ('mediagoblin', {}, []),
+            ('plugins', {}, [
+                    ('mediagoblin.tests.testplugins.callables1', {}, []),
+                    ('mediagoblin.tests.testplugins.callables2', {}, []),
+                    ('mediagoblin.tests.testplugins.callables3', {}, []),
+                    ])
+            ])
+
+    mg_globals.app_config = cfg['mediagoblin']
+    mg_globals.global_config = cfg
+
+    setup_plugins()
+
+    # Just one hook, check results
+    call_log = []
+    assert pluginapi.callable_runall(
+        "just_one", call_log) == ["Called just once", None, None]
+    assert call_log == ["expect this one call"]
+
+    # None provided, check results
+    call_log = []
+    assert pluginapi.callable_runall(
+        "nothing_handling", call_log) == []
+    assert call_log == []
+
+    # Multiple provided, check results
+    call_log = []
+    assert pluginapi.callable_runall(
+        "multi_handle", call_log) == [
+            "the first returns",
+            "the second returns",
+            "the third returns",
+        ]
+    assert call_log == [
+        "Hi, I'm the first",
+        "Hi, I'm the second",
+        "Hi, I'm the third"]
+
+    # Multiple provided, one has CantHandleIt, check results
+    call_log = []
+    assert pluginapi.callable_runall(
+        "multi_handle_with_canthandle", call_log) == [
+            "the second returns",
+            "the third returns",
+        ]
+    assert call_log == [
+        "Hi, I'm the second",
+        "Hi, I'm the third"]