Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions dvc/lock.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,13 @@

DEFAULT_TIMEOUT = 3


FAILED_TO_LOCK_MESSAGE = (
"cannot perform the command because another DVC process seems to be "
"running on this project. If that is not the case, manually remove "
"`.dvc/tmp/lock` and try again."
"Unable to acquire lock. Most likely another DVC process is running or "
"was terminated abruptly. Check the page {} for other possible reasons "
"and to learn how to resolve this."
).format(
format_link("https://dvc.org/doc/user-guide/troubleshooting#lock-issue")
)


Expand Down
10 changes: 8 additions & 2 deletions tests/func/test_lock.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import pytest

from dvc.lock import FAILED_TO_LOCK_MESSAGE, Lock, LockError
from dvc.lock import Lock, LockError
from dvc.main import main


Expand All @@ -18,6 +18,12 @@ def test_cli(tmp_dir, dvc, mocker, caplog):
# patching to speedup tests
mocker.patch("dvc.lock.DEFAULT_TIMEOUT", 0.01)

expected_error_msg = (
"Unable to acquire lock. Most likely another DVC process is "
"running or was terminated abruptly. Check the page "
"<https://dvc.org/doc/user-guide/troubleshooting#lock-issue> "
"for other possible reasons and to learn how to resolve this."
)
with Lock(tmp_dir / dvc.tmp_dir / "lock"):
assert main(["add", "foo"]) == 1
assert FAILED_TO_LOCK_MESSAGE in caplog.text
assert expected_error_msg in caplog.text