Skip to content

Commit fde1262

Browse files
committed
Skip the celery test on osx too, and improve the style on some skipifs.
1 parent fd3513d commit fde1262

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

tests/test_pytest_cov.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import pytest_cov.plugin
2323

24-
coverage, platform # required for skipif mark on test_cov_min_from_coveragerc
2524

2625
max_worker_restart_0 = '--max-worker-restart=0'
2726

@@ -693,7 +692,8 @@ def test_foobar(bad):
693692
assert result.ret == 0
694693

695694

696-
@pytest.mark.skipif('sys.platform == "win32"', reason='No redis server on Windows')
695+
@pytest.mark.skipif(sys.platform == 'win32', reason='No redis server on Windows')
696+
@pytest.mark.skipif(sys.platform == 'darwin', reason='No redis server on OSX')
697697
def test_celery(pytester):
698698
pytester.makepyfile(
699699
small_celery="""
@@ -1205,8 +1205,7 @@ def test_funcarg_not_active(testdir):
12051205
assert result.ret == 0
12061206

12071207

1208-
@pytest.mark.skipif('sys.platform == "win32"', reason="SIGTERM isn't really supported on Windows")
1209-
@pytest.mark.xfail('platform.python_implementation() == "PyPy"', reason='Interpreter seems buggy')
1208+
@pytest.mark.skipif(sys.platform == 'win32', reason="SIGTERM isn't really supported on Windows")
12101209
def test_cleanup_on_sigterm(testdir):
12111210
testdir.makepyprojecttoml(
12121211
"""
@@ -1256,7 +1255,7 @@ def test_run():
12561255
assert result.ret == 0
12571256

12581257

1259-
@pytest.mark.skipif('sys.platform != "win32"')
1258+
@pytest.mark.skipif(sys.platform != 'win32', reason='SIGBREAK is Windows only')
12601259
@pytest.mark.parametrize(
12611260
'setup',
12621261
[

0 commit comments

Comments
 (0)