[pypy-svn] r63189 - in pypy/trunk: dotviewer lib-python pypy

[hpk at codespeak.net]

Author: hpk
Date: Sat Mar 21 16:15:24 2009
New Revision: 63189

Modified:
   pypy/trunk/dotviewer/conftest.py
   pypy/trunk/lib-python/conftest.py
   pypy/trunk/pypy/conftest.py
Log:
* specifying resultlog plugin as a dependency
* fixing some dist-related settings


Modified: pypy/trunk/dotviewer/conftest.py
==============================================================================
--- pypy/trunk/dotviewer/conftest.py	(original)
+++ pypy/trunk/dotviewer/conftest.py	Sat Mar 21 16:15:24 2009
@@ -1,7 +1,8 @@
 import py
 
-Option = py.test.config.Option
-option = py.test.config.addoptions("dotviewer options",
-        Option('--pygame', action="store_true", dest="pygame", default=False,
-               help="allow interactive tests using Pygame"),
-        )
+class ConftestPlugin:
+    def pytest_addoption(self, parser):
+        group = parser.addgroup("dotviever")
+        group.addoption('--pygame', action="store_true", 
+            dest="pygame", default=False, 
+            help="allow interactive tests using Pygame")

Modified: pypy/trunk/lib-python/conftest.py
==============================================================================
--- pypy/trunk/lib-python/conftest.py	(original)
+++ pypy/trunk/lib-python/conftest.py	Sat Mar 21 16:15:24 2009
@@ -21,7 +21,8 @@
 from pypy.tool.pytest.confpath import pypydir, libpythondir, \
                                       regrtestdir, modregrtestdir, testresultdir
 
-dist_rsync_roots = ['.', '../pypy', '../py']
+pytest_plugins = "resultlog",
+rsyncdirs = ['.', '../pypy']
     
 # 
 # Interfacing/Integrating with py.test's collection process 

Modified: pypy/trunk/pypy/conftest.py
==============================================================================
--- pypy/trunk/pypy/conftest.py	(original)
+++ pypy/trunk/pypy/conftest.py	Sat Mar 21 16:15:24 2009
@@ -10,11 +10,11 @@
 
 rootdir = py.magic.autopath().dirpath()
 
-# distributed testing settings
-dist_rsync_roots = ['.', '../lib-python', '../py', '../demo']
-dist_rsync_ignore = ['_cache']
-
-# 
+# pytest settings
+pytest_plugins = "resultlog",
+rsyncdirs = ['.', '../lib-python', '../demo']
+rsyncignore = ['_cache']
+ 
 # PyPy's command line extra options (these are added 
 # to py.test's standard options) 
 #