[py-svn] r51056 - py/trunk/py/green
hpk at codespeak.net
hpk at codespeak.net
Sat Jan 26 11:58:24 CET 2008
Author: hpk
Date: Sat Jan 26 11:58:23 2008
New Revision: 51056
Modified:
py/trunk/py/green/conftest.py
Log:
fijal: don't use py.test.skip directly in a conftest.py -
this will get called very early during import time.
This lead to windows not executing any py/ tests at all.
Modified: py/trunk/py/green/conftest.py
==============================================================================
--- py/trunk/py/green/conftest.py (original)
+++ py/trunk/py/green/conftest.py Sat Jan 26 11:58:23 2008
@@ -1,4 +1,8 @@
import py, os
-if os.name == 'nt':
- py.test.skip("Cannot test green layer on windows")
+class Directory(py.test.collect.Directory):
+ def run(self):
+ if os.name == 'nt':
+ py.test.skip("Cannot test green layer on windows")
+ else:
+ return super(Directory, self).run()
More information about the pytest-commit
mailing list