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

[hpk at codespeak.net]

Author: hpk
Date: Fri Feb 20 12:15:39 2009
New Revision: 62046

Modified:
   py/branch/pytestplugin/py/_com.py
   py/branch/pytestplugin/py/misc/testing/test_com.py
   py/branch/pytestplugin/py/test/handleplugin.py
   py/branch/pytestplugin/py/test/testing/test_handleplugin.py
Log:
more regular naming of call methods 



Modified: py/branch/pytestplugin/py/_com.py
==============================================================================
--- py/branch/pytestplugin/py/_com.py	(original)
+++ py/branch/pytestplugin/py/_com.py	Fri Feb 20 12:15:39 2009
@@ -89,11 +89,11 @@
         """ return first non-None result of a plugin method. """ 
         return Call(self.listattr(methname), *args, **kwargs).execute(firstresult=True)
 
-    def callplugin(self, plugin, methname, *args, **kwargs):
+    def call_plugin(self, plugin, methname, *args, **kwargs):
         return Call(self.listattr(methname, plugins=[plugin]), 
                     *args, **kwargs).execute(firstresult=True)
 
-    def callevent(self, eventname, *args, **kwargs):
+    def notify(self, eventname, *args, **kwargs):
         return Call(
             self.listattr("pyevent_" + eventname) + self.listattr('pyevent') + 
             self._callbacks, *args, **kwargs).execute()

Modified: py/branch/pytestplugin/py/misc/testing/test_com.py
==============================================================================
--- py/branch/pytestplugin/py/misc/testing/test_com.py	(original)
+++ py/branch/pytestplugin/py/misc/testing/test_com.py	Fri Feb 20 12:15:39 2009
@@ -81,8 +81,8 @@
         assert 33 in reslist
         assert pm.call_each("notexist") == []
 
-        assert pm.callplugin(api1(), 'm', x=12) == 12
-        assert pm.callplugin(api2(), 't') is None
+        assert pm.call_plugin(api1(), 'm', x=12) == 12
+        assert pm.call_plugin(api2(), 't') is None
 
     def test_call_none_is_no_result(self):
         pm = PluginManager()
@@ -120,7 +120,7 @@
         l.sort()
         assert l == [41, 42]
 
-    def test_callevent(self):
+    def test_notify(self):
         pm = PluginManager()
         class api1:
             def pyevent_some(self, x): return x + 1
@@ -130,7 +130,7 @@
         pm.register(api1())
         pm.register(api2())
         pm.subscribe(l.append)
-        res = pm.callevent('some', 0)
+        res = pm.notify('some', 0)
         assert res == [2, 1]
         assert l == [0]
 

Modified: py/branch/pytestplugin/py/test/handleplugin.py
==============================================================================
--- py/branch/pytestplugin/py/test/handleplugin.py	(original)
+++ py/branch/pytestplugin/py/test/handleplugin.py	Fri Feb 20 12:15:39 2009
@@ -68,7 +68,7 @@
 
     def configure(self, config):
         def configureplugin(plugin):
-            self.pm.callplugin(plugin, "pytest_configure", config=config)
+            self.pm.call_plugin(plugin, "pytest_configure", config=config)
             if hasattr(plugin, 'pytest_event'):
                 config.bus._bus.subscribe(plugin.pytest_event)
             config.bus.subscribe_methods(plugin) 
@@ -79,7 +79,7 @@
 
     def unconfigure(self, config):
         for plugin in self.pm.plugins:
-            self.pm.callplugin(plugin, "pytest_unconfigure", config=config)
+            self.pm.call_plugin(plugin, "pytest_unconfigure", config=config)
         config.bus.close()
         del self._configureplugin
 

Modified: py/branch/pytestplugin/py/test/testing/test_handleplugin.py
==============================================================================
--- py/branch/pytestplugin/py/test/testing/test_handleplugin.py	(original)
+++ py/branch/pytestplugin/py/test/testing/test_handleplugin.py	Fri Feb 20 12:15:39 2009
@@ -212,16 +212,16 @@
         pm.addpluginclass(My1)
         assert pm.getfirst("x") == 1
 
-    def test_callplugins(self):
+    def test_call_plugins(self):
         pm = PytestPluginManager()
         class My:
             def method(self, arg):
                 pass
         pm.addpluginclass(My)
-        py.test.raises(TypeError, 'pm.callplugins("method")')
-        py.test.raises(TypeError, 'pm.callplugins("method", 42)')
-        pm.callplugins("method", arg=42)
-        py.test.raises(TypeError, 'pm.callplugins("method", arg=42, s=13)')
+        py.test.raises(TypeError, 'pm.call_plugins("method")')
+        py.test.raises(TypeError, 'pm.call_plugins("method", 42)')
+        pm.call_plugins("method", arg=42)
+        py.test.raises(TypeError, 'pm.call_plugins("method", arg=42, s=13)')
 
     def test_call_firstresult(self):
         pm = PytestPluginManager()