Always skip this on PyPy as it sometimes fail with error: release unlocked lock and the goal of this test was rather to assert that combining is done in the right place not that xdist works well on pypy.

The traceback:

    /home/travis/pypy2-v6.0.0-linux64/lib-python/2.7/logging/__init__.py:846: in __init__
        Handler.__init__(self)
    /home/travis/pypy2-v6.0.0-linux64/lib-python/2.7/logging/__init__.py:688: in __init__
        _addHandlerRef(self)
    /home/travis/pypy2-v6.0.0-linux64/lib-python/2.7/logging/__init__.py:667: in _addHandlerRef
        _releaseLock()
    /home/travis/pypy2-v6.0.0-linux64/lib-python/2.7/logging/__init__.py:232: in _releaseLock
        _lock.release()

Author: ionelmc

tests/test_pytest_cov.py

@@ -549,7 +549,7 @@ def test_fail(p):
     ])
 
 
-@pytest.mark.skipif('sys.platform == "win32" and platform.python_implementation() == "PyPy"')
+@pytest.mark.skipif('sys.platform == "win32" or platform.python_implementation() == "PyPy"')
 def test_dist_combine_racecondition(testdir):
     script = testdir.makepyfile("""
 import pytest