[pypy-svn] r62441 - pypy/trunk/lib-python
hpk at codespeak.net
hpk at codespeak.net
Tue Mar 3 09:41:28 CET 2009
Author: hpk
Date: Tue Mar 3 09:41:28 2009
New Revision: 62441
Modified:
pypy/trunk/lib-python/conftest.py
Log:
avoid another deprecation warning
Modified: pypy/trunk/lib-python/conftest.py
==============================================================================
--- pypy/trunk/lib-python/conftest.py (original)
+++ pypy/trunk/lib-python/conftest.py Tue Mar 3 09:41:28 2009
@@ -27,16 +27,19 @@
# Interfacing/Integrating with py.test's collection process
#
-Option = py.test.config.Option
-option = py.test.config.addoptions("compliance testing options",
- Option('-T', '--timeout', action="store", type="string",
+class LibPythonPlugin:
+ def pytest_addoption(self, parser):
+ group = parser.addgroup("complicance testing options")
+ group.addoption('-T', '--timeout', action="store", type="string",
default="100mp", dest="timeout",
help="fail a test module after the given timeout. "
- "specify in seconds or 'NUMmp' aka Mega-Pystones"),
- Option('--pypy', action="store", type="string",
+ "specify in seconds or 'NUMmp' aka Mega-Pystones")
+ group.addoption('--pypy', action="store", type="string",
dest="pypy", help="use given pypy executable to run lib-python tests. "
"This will run the tests directly (i.e. not through py.py)")
- )
+
+ConftestPlugin = LibPythonPlugin
+option = py.test.config.option
def gettimeout():
timeout = option.timeout.lower()
More information about the Pypy-commit
mailing list