[py-svn] r61948 - in py/branch/pytestplugin/py/misc: . testing

[hpk at codespeak.net]

Author: hpk
Date: Mon Feb 16 14:08:02 2009
New Revision: 61948

Modified:
   py/branch/pytestplugin/py/misc/plugin.py
   py/branch/pytestplugin/py/misc/testing/test_plugin.py
Log:
use less globals


Modified: py/branch/pytestplugin/py/misc/plugin.py
==============================================================================
--- py/branch/pytestplugin/py/misc/plugin.py	(original)
+++ py/branch/pytestplugin/py/misc/plugin.py	Mon Feb 16 14:08:02 2009
@@ -1,12 +1,14 @@
 import py
-from py.__.misc.event import eventbus
 
 class PluginManager:
     _pyspec = "pylib" 
 
-    def __init__(self):
+    def __init__(self, bus=None):
+        if bus is None:
+            from py.__.misc.event import eventbus as bus
+        self._bus = bus 
         self.list = []
-        eventbus.subscribe(self._forwardevent)
+        self._bus.subscribe(self._forwardevent)
 
     def _forwardevent(self, (name, obj)):
         self.calleach("pyevent_" + name, obj)
@@ -14,7 +16,7 @@
     def import_module(self, modspec):
         # XXX allow modspec to specify version / lookup 
         modpath = modspec
-        py.event.notify(importingmodule=modpath)
+        self._bus.notify(importingmodule=modpath)
         __import__(modpath) 
 
     def consider_env(self):

Modified: py/branch/pytestplugin/py/misc/testing/test_plugin.py
==============================================================================
--- py/branch/pytestplugin/py/misc/testing/test_plugin.py	(original)
+++ py/branch/pytestplugin/py/misc/testing/test_plugin.py	Mon Feb 16 14:08:02 2009
@@ -87,8 +87,9 @@
         assert len(l) == 1
         assert l[0] == mod.pylib
 
-def test_api():
+def test_api_and_defaults():
     assert isinstance(py.plugin, PluginManager)
+    assert py.plugin._bus is py.event
 
 def test_subprocess_env():
     # XXX write a helper for preserving os.environ