[py-svn] r37501 - in py/trunk/py/test: . testing
hpk at codespeak.net
hpk at codespeak.net
Sun Jan 28 21:37:31 CET 2007
Author: hpk
Date: Sun Jan 28 21:37:30 2007
New Revision: 37501
Modified:
py/trunk/py/test/config.py
py/trunk/py/test/conftesthandle.py
py/trunk/py/test/testing/test_conftesthandle.py
Log:
rename for clarity
Modified: py/trunk/py/test/config.py
==============================================================================
--- py/trunk/py/test/config.py (original)
+++ py/trunk/py/test/config.py Sun Jan 28 21:37:30 2007
@@ -122,7 +122,7 @@
""" same as previous, but returns conftest's path
as well
"""
- val, mod = self.conftest.rget_path(name, path)
+ val, mod = self.conftest.rget_with_confmod(name, path)
return val, py.path.local(mod.__file__).dirpath()
def initsession(self):
Modified: py/trunk/py/test/conftesthandle.py
==============================================================================
--- py/trunk/py/test/conftesthandle.py (original)
+++ py/trunk/py/test/conftesthandle.py Sun Jan 28 21:37:30 2007
@@ -64,7 +64,7 @@
modules.reverse()
return self._get(name, modules)
- def rget_path(self, name, path=None):
+ def rget_with_confmod(self, name, path=None):
return self._rget(name, path)
def _get(self, name, modules):
Modified: py/trunk/py/test/testing/test_conftesthandle.py
==============================================================================
--- py/trunk/py/test/testing/test_conftesthandle.py (original)
+++ py/trunk/py/test/testing/test_conftesthandle.py Sun Jan 28 21:37:30 2007
@@ -68,7 +68,7 @@
def test_value_access_path(self):
topdir = self.basedir.join("adir", "b")
conftest = Conftest(topdir)
- _, mod = conftest.rget_path("a")
+ _, mod = conftest.rget_with_confmod("a")
assert py.path.local(mod.__file__).dirpath() == topdir
class TestConftestValueAccessInPackage(TestConftestValueAccessGlobal):
More information about the pytest-commit
mailing list