Skip to content

Fix blockers list in rwlock error message #3285

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
merged 1 commit into from
Feb 6, 2020
Merged

Fix blockers list in rwlock error message #3285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions dvc/rwlock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,11 @@ def _infos_to_str(infos):
def _check_blockers(lock, info, *, mode, waiters):
for path_info in waiters:
blockers = [
info
blocker
for path, infos in lock[mode].items()
if path_info.overlaps(path)
if info not in (infos if type(infos) is list else [infos])
for blocker in (infos if isinstance(infos, list) else [infos])
if blocker != info
]

if not blockers:
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/test_rwlock.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ def test_rwlock_subdirs(tmp_path):
subfoo = PathInfo("foo/subfoo")

with rwlock(path, "cmd1", [foo], []):
with pytest.raises(LockError):
with pytest.raises(LockError, match=r"subfoo(.|\n)*cmd1"):
with rwlock(path, "cmd2", [], [subfoo]):
pass

with rwlock(path, "cmd1", [], [subfoo]):
with pytest.raises(LockError):
with pytest.raises(LockError, match=r"'foo'(.|\n)*cmd1"):
with rwlock(path, "cmd2", [foo], []):
pass

Expand Down