Merge pull request #31 from pytest-dev/xfail-auto-detect-cpus-test

Mark test_auto_detect_cpus as xfail until #30 is fixed
This commit is contained in:
holger krekel
2015-12-09 13:26:27 +01:00

View File

@@ -353,6 +353,7 @@ def test_terminate_on_hangingnode(testdir):
result.stdout.fnmatch_lines(["*killed*my*", ]) result.stdout.fnmatch_lines(["*killed*my*", ])
@pytest.mark.xfail(reason='see #30')
def test_auto_detect_cpus(testdir, monkeypatch): def test_auto_detect_cpus(testdir, monkeypatch):
import multiprocessing import multiprocessing
monkeypatch.setattr(multiprocessing, 'cpu_count', lambda: 3) monkeypatch.setattr(multiprocessing, 'cpu_count', lambda: 3)