conftest.py: allow some tests to run on windows

Author: João Eiras

testing/conftest.py

@@ -186,8 +186,8 @@ def gw(request, execmodel, group):
 def execmodel(request):
     if request.param != "thread":
         pytest.importorskip(request.param)
-    if sys.platform == "win32":
-        pytest.xfail("eventlet/gevent do not work onwin32")
+    if request.param in ("eventlet", "gevent") and sys.platform == "win32":
+        pytest.xfail(request.param + " does not work on win32")
     return get_execmodel(request.param)
 
 

testing/test_basics.py

@@ -218,8 +218,6 @@ def test_stdouterrin_setnull(execmodel):
     cap = py.io.StdCaptureFD()
     gateway_base.init_popen_io(execmodel)
     os.write(1, "hello".encode('ascii'))
-    if os.name == "nt":
-        os.write(2, "world")
     os.read(0, 1)
     out, err = cap.reset()
     assert not out