Merge pull request #27 from nicoddemus/race-condition-on-collect-hotfix

Race condition on collect hotfix

Author: nicoddemus

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.4.2 #
+
+- Proper fix for #25, the fix made in `0.4.1` was incorrect.
+
 # 0.4.1 #
 
 - Fix error that may happen during collection when using xdist (#25).

pytest_cpp/plugin.py

@@ -17,7 +17,7 @@ def pytest_collect_file(parent, path):
         is_executable = os.stat(str(path)).st_mode & stat.S_IXUSR
     except OSError:
         # in some situations the file might not be available anymore at this point
-        return False
+        is_executable = False
     if not is_executable:
         return
     masks = parent.config.getini('cpp_files') or DEFAULT_MASKS

setup.py

@@ -3,7 +3,7 @@
 
 setup(
     name="pytest-cpp",
-    version='0.4.1',
+    version='0.4.2',
     packages=['pytest_cpp'],
     entry_points={
         'pytest11': ['cpp = pytest_cpp.plugin'],

tests/test_pytest_cpp.py

@@ -254,7 +254,7 @@ def test_race_condition_on_collect(tmpdir):
         '/../test_duplicate_filenames.cpython-27-PYTEST.pyc.21746'
     """
     import pytest_cpp.plugin
-    assert not pytest_cpp.plugin.pytest_collect_file(None, tmpdir / 'invalid-file')
+    assert pytest_cpp.plugin.pytest_collect_file(None, tmpdir / 'invalid-file') is None
 
 
 class TestError: