[pypy-commit] pypy pytest: kill winreg test __init__ to avoid importing and skip on collection instead of execution

[RonnyPfannschmidt]

Author: Ronny Pfannschmidt <Ronny.Pfannschmidt at gmx.de>
Branch: pytest
Changeset: r60974:1b0b2f5c1cf1
Date: 2013-02-08 15:35 +0100
http://bitbucket.org/pypy/pypy/changeset/1b0b2f5c1cf1/

Log:	kill winreg test __init__ to avoid importing and skip on collection
	instead of execution

diff --git a/pypy/module/_winreg/test/__init__.py b/pypy/module/_winreg/test/__init__.py
deleted file mode 100644
diff --git a/pypy/module/_winreg/test/test_winreg.py b/pypy/module/_winreg/test/test_winreg.py
--- a/pypy/module/_winreg/test/test_winreg.py
+++ b/pypy/module/_winreg/test/test_winreg.py
@@ -1,10 +1,12 @@
 from rpython.tool.udir import udir
 
 import os, sys, py
-pytestmark = py.test.mark.skipif('sys.platform != "win32"', reason='_winreg is a win32 module')
 
 canSaveKey = None
 
+#XXX: mark again
+if sys.platform != "win32":
+    py.test.skip('_winreg is a win32 module')
 
 def setup_module(mod):
     try: