Skip to content

pytest-related updates #36

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
trbs merged 3 commits into from
Nov 16, 2020
Merged

pytest-related updates #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68c13ac
Use pytest.raises() instead of custom raising() decorator
mgorny Nov 14, 2020
34cc216
Update test dependencies and modernize setup.py
mgorny Nov 14, 2020
18599b9
Add a convenience tox.ini for running tests
mgorny Nov 14, 2020
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
8 changes: 6 additions & 2 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ def find_version(*file_paths):
install_requires=[
'psutil>=5.4.8 ; sys_platform == "win32"',
],
test_suite='nose.collector',
tests_require=['nose>=1.0'],
extras_require={
'tests': [
'mock ; python_version < "3"',
'pytest',
]
},
)
65 changes: 16 additions & 49 deletions tests/test_pid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,39 +25,6 @@
pid.DEFAULT_PID_DIR = pid.DEFAULT_PID_DIR.replace("\\", "/")


# https://code.google.com/p/python-nose/issues/detail?id=175
@contextmanager
def raising(*exc_types):
"""
A context manager to ensure that an exception of a given list of
types is thrown.

Instead of::

@nose.tools.raises(ValueError)
def test_that_raises():
# ... lengthy setup
raise ValueError

you can write::

def test_that_raises_at_the_end():
# ... lengthy setup
with raising(ValueError):
raise ValueError

to make the scope for catching exceptions as small as possible.
"""
try:
yield
except exc_types:
pass
except Exception:
raise
else:
raise AssertionError("Failed to throw exception of type(s) %s." % (", ".join(exc_type.__name__ for exc_type in exc_types),))


@contextmanager
def raising_windows_io_error():
try:
Expand Down Expand Up @@ -136,7 +103,7 @@ def test_pid_custom_dir():

def test_pid_piddir_exists_as_file():
with tempfile.NamedTemporaryFile() as tmpfile:
with raising(IOError):
with pytest.raises(IOError):
with pid.PidFile(piddir=tmpfile.name):
pass

Expand Down Expand Up @@ -195,14 +162,14 @@ def test_pid_chmod():

@pytest.mark.skipif(sys.platform != "win32", reason="only runs on windows")
def test_pid_chmod_win32():
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
with pid.PidFile(chmod=0o600):
pass


def test_pid_already_locked():
with pid.PidFile() as _pid:
with raising(pid.PidFileAlreadyLockedError):
with pytest.raises(pid.PidFileAlreadyLockedError):
with pid.PidFile():
pass
assert os.path.exists(_pid.filename)
Expand All @@ -211,7 +178,7 @@ def test_pid_already_locked():

def test_pid_already_locked_custom_name():
with pid.PidFile(pidname="testpidfile") as _pid:
with raising(pid.PidFileAlreadyLockedError):
with pytest.raises(pid.PidFileAlreadyLockedError):
with pid.PidFile(pidname="testpidfile"):
pass
assert os.path.exists(_pid.filename)
Expand Down Expand Up @@ -254,7 +221,7 @@ def test_pid_two_locks_multi_process():

def test_pid_already_running():
with pid.PidFile(lock_pidfile=False) as _pid:
with raising(pid.PidFileAlreadyRunningError):
with pytest.raises(pid.PidFileAlreadyRunningError):
with pid.PidFile(lock_pidfile=False):
pass
assert os.path.exists(_pid.filename)
Expand All @@ -263,7 +230,7 @@ def test_pid_already_running():

def test_pid_already_running_custom_name():
with pid.PidFile(lock_pidfile=False, pidname="testpidfile") as _pid:
with raising(pid.PidFileAlreadyRunningError):
with pytest.raises(pid.PidFileAlreadyRunningError):
with pid.PidFile(lock_pidfile=False, pidname="testpidfile"):
pass
assert os.path.exists(_pid.filename)
Expand Down Expand Up @@ -296,7 +263,7 @@ def test_pid_decorator_already_locked():

@pidfile("testpiddecorator")
def test_decorator():
with raising(pid.PidFileAlreadyLockedError):
with pytest.raises(pid.PidFileAlreadyLockedError):
@pidfile("testpiddecorator")
def test_decorator2():
pass
Expand All @@ -319,7 +286,7 @@ def test_pid_multiplecreate():
pidfile = pid.PidFile()
pidfile.create()
try:
with raising(pid.PidFileAlreadyRunningError, pid.PidFileAlreadyLockedError):
with pytest.raises((pid.PidFileAlreadyRunningError, pid.PidFileAlreadyLockedError)):
pidfile.create()
finally:
pidfile.close()
Expand All @@ -337,7 +304,7 @@ def test_pid_gid():
@pytest.mark.skipif(sys.platform != "win32", reason="only runs on windows")
def test_pid_gid_win32():
gid = 123
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
with pid.PidFile(gid=gid):
pass

Expand Down Expand Up @@ -368,7 +335,7 @@ def check_const_samepid():
if sys.platform != "win32":
check_const_samepid()
else:
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
check_const_samepid()


Expand All @@ -392,7 +359,7 @@ def check_const_notrunning():
def test_pid_check_already_running():
with pid.PidFile() as pidfile:
pidfile2 = pid.PidFile()
with raising(pid.PidFileAlreadyRunningError):
with pytest.raises(pid.PidFileAlreadyRunningError):
pidfile2.check()
assert not os.path.exists(pidfile.filename)

Expand All @@ -414,13 +381,13 @@ def check_samepid_with_blocks_same_objects():
if sys.platform != "win32":
check_samepid_with_blocks_separate_objects()
else:
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
check_samepid_with_blocks_separate_objects()

if sys.platform != "win32":
check_samepid_with_blocks_same_objects()
else:
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
check_samepid_with_blocks_same_objects()


Expand All @@ -439,7 +406,7 @@ def check_samepid():
if sys.platform != "win32":
check_samepid()
else:
with raising(pid.PidFileConfigurationError):
with pytest.raises(pid.PidFileConfigurationError):
check_samepid()


Expand All @@ -455,7 +422,7 @@ def test_pid_raises_already_running_when_samepid_and_two_different_pids(mock_get
pidfile_proc1.create()

mock_getpid.return_value = 2
with raising(pid.PidFileAlreadyRunningError):
with pytest.raises(pid.PidFileAlreadyRunningError):
pidfile_proc2.create()

finally:
Expand Down Expand Up @@ -544,7 +511,7 @@ def test_decorator():
def test_pid_contextdecorator_already_locked():
@pid.PidFile("testpiddecorator")
def test_decorator():
with raising(pid.PidFileAlreadyLockedError):
with pytest.raises(pid.PidFileAlreadyLockedError):
@pid.PidFile("testpiddecorator")
def test_decorator2():
pass
Expand Down
8 changes: 8 additions & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[tox]
envlist = py27,py36,py37,py38,py39,pypy,pypy3
Copy link
Contributor Author

@mgorny mgorny Nov 14, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the record, I've only listed the impls that I have installed here and can therefore test.


[testenv]
extras =
tests
commands =
pytest {posargs}