[pypy-svn] pypy pytest2: small bug fixes due to pytest2 doing a full collection before running of tests

[hpk42]

Author: holger krekel <holger at merlinux.eu>
Branch: pytest2
Changeset: r42477:c9d6fc564547
Date: 2011-03-08 17:10 +0100
http://bitbucket.org/pypy/pypy/changeset/c9d6fc564547/

Log:	small bug fixes due to pytest2 doing a full collection before
	running of tests

diff --git a/lib_pypy/distributed/test/test_distributed.py b/lib_pypy/distributed/test/test_distributed.py
--- a/lib_pypy/distributed/test/test_distributed.py
+++ b/lib_pypy/distributed/test/test_distributed.py
@@ -4,9 +4,11 @@
 
 from pypy.conftest import gettestobjspace
 import sys
+import pytest
 
 class AppTestNoProxy(object):
-    disabled = True
+
+    @pytest.mark.xfail(run=False)
     def test_init(self):
         raises(ImportError, "import distributed")
 

diff --git a/lib_pypy/ctypes_config_cache/test/test_cache.py b/lib_pypy/ctypes_config_cache/test/test_cache.py
--- a/lib_pypy/ctypes_config_cache/test/test_cache.py
+++ b/lib_pypy/ctypes_config_cache/test/test_cache.py
@@ -11,6 +11,7 @@
                          dir=True)
     tmpdir.join('dumpcache.py').write(dirpath.join('dumpcache.py').read())
     path = sys.path[:]
+    sys.modules.pop('dumpcache', None)
     try:
         sys.path.insert(0, str(tmpdir))
         execfile(str(filepath), {})