Fix plugin instantiation

mdboom · mdboom · commit 0cf5dcb3fb00 · 2015-10-28T17:22:35.000-04:00
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1513,7 +1513,7 @@ def _get_extra_test_plugins():
     from .testing.noseclasses import KnownFailure
     from nose.plugins import attrib
 
-    return [KnownFailure(), attrib.Plugin()]
+    return [KnownFailure, attrib.Plugin]
 
 
 def test(verbosity=1):
@@ -1532,7 +1532,7 @@ def test(verbosity=1):
         plugins = _get_extra_test_plugins()
         plugins.extend([plugin() for plugin in nose.plugins.builtin.plugins])
 
-        manager = PluginManager(plugins=plugins)
+        manager = PluginManager(plugins=[x() for x in plugins])
         config = nose.config.Config(verbosity=verbosity, plugins=manager)
 
         # Nose doesn't automatically instantiate all of the plugins in the
diff --git a/tests.py b/tests.py
@@ -31,7 +31,7 @@ def run(extra_args):
     plugins = matplotlib._get_extra_test_plugins()
     multiprocess._instantiate_plugins = plugins
 
-    nose.main(addplugins=plugins,
+    nose.main(addplugins=[x() for x in plugins],
               defaultTest=default_test_modules,
               argv=sys.argv + extra_args)
 
