From f7e1bbeb247e2b687e0113b4d73e6c28330844ee Mon Sep 17 00:00:00 2001 From: hpk Date: Sat, 26 Jan 2008 11:58:23 +0100 Subject: [PATCH] [svn r51056] 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. --HG-- branch : trunk --- py/green/conftest.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/py/green/conftest.py b/py/green/conftest.py index 361296acf..1bbd7d3d3 100644 --- a/py/green/conftest.py +++ b/py/green/conftest.py @@ -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()