Skip to content
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

Jump to bottom

Raise NotImplementedError if using wrong class #135

Merged
merged 11 commits into from Feb 17, 2022
Merged

Raise NotImplementedError if using wrong class #135

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e5fdb3d
Raise PlatformMismatchError if using wrong class
vonschultz Feb 14, 2022
a2fa785
Remove unused ABC import
vonschultz Feb 14, 2022
62f649f
Use NotImplementedError, not PlatformMismatchError
vonschultz Feb 17, 2022
1d61cdb
Add tests and a note in the change log
vonschultz Feb 17, 2022
039dc57
Merge remote-tracking branch 'upstream/main' into platform-mismatch-e…
vonschultz Feb 17, 2022
8954719
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 17, 2022
6d1f52f
Tell flake8 that isabstract is not a misspelling
vonschultz Feb 17, 2022
dc782e2
Make the wrong-platform tests a single test
vonschultz Feb 17, 2022
a2458d9
Set release date to today
vonschultz Feb 17, 2022
399576e
Move isabstract check before lock instantiation
vonschultz Feb 17, 2022
4f0e020
PR feedback
gaborbernat Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/changelog.rst
View file
Open in desktop
@@ -1,8 +1,8 @@
Changelog
=========

Future
------
v3.6.0 (2022-02-17)
-------------------
- Fix pylint warning "Abstract class :class:`WindowsFileLock <filelock.WindowsFileLock>` with abstract methods instantiated"
:pr:`135` - by :user:`vonschultz`
- Fix pylint warning "Abstract class :class:`UnixFileLock <filelock.UnixFileLock>` with abstract methods instantiated"
Expand Down
19 changes: 3 additions & 16 deletions tests/test_filelock.py
View file
Open in desktop
Expand Up @@ -385,26 +385,13 @@ def decorated_method() -> None:
assert not lock.is_locked


@pytest.mark.skipif(sys.platform != "win32", reason="Tests behavior of UnixFileLock on Windows systems")
def test_unix_lock_on_windows(tmp_path: Path) -> None:
lock = UnixFileLock(str(tmp_path / "lockfile"))
def test_wrong_platform(tmp_path: Path) -> None:
lock_type = UnixFileLock if sys.platform == "win32" else WindowsFileLock
lock = lock_type(str(tmp_path / "lockfile"))

assert not inspect.isabstract( # noqa: SC200
vonschultz marked this conversation as resolved.
Show resolved Hide resolved
UnixFileLock
), "UnixFileLock must not be an abstract class, or pylint will complain in client code"
assert inspect.isabstract(BaseFileLock) # noqa: SC200

with pytest.raises(NotImplementedError):
lock.acquire()

with pytest.raises(NotImplementedError):
lock._release()


@pytest.mark.skipif(sys.platform == "win32", reason="Tests behavior of WindowsFileLock on non-Windows systems")
def test_windows_lock_on_unix(tmp_path: Path) -> None:
lock = WindowsFileLock(str(tmp_path / "lockfile"))

assert not inspect.isabstract( # noqa: SC200
WindowsFileLock
), "WindowsFileLock must not be an abstract class, or pylint will complain in client code"
Expand Down