Skip to content

Race condition on collect hotfix #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicoddemus merged 2 commits into from
Sep 23, 2016
Merged

Race condition on collect hotfix #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d8b264
Implement correct fix for #25
nicoddemus Sep 23, 2016
545488f
Bump version to 0.4.2
nicoddemus Sep 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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).
Expand Down
2 changes: 1 addition & 1 deletion pytest_cpp/plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
2 changes: 1 addition & 1 deletion tests/test_pytest_cpp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down