From e528a42ddc2464d2e03bdc9331a1ccc50fa8ce25 Mon Sep 17 00:00:00 2001 From: Ivan Zaikin Date: Tue, 28 Jul 2020 08:55:32 +0700 Subject: [PATCH] Support OpenBSD and NetBSD --- src/xdist/plugin.py | 6 +----- testing/test_plugin.py | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/xdist/plugin.py b/src/xdist/plugin.py index fea8b5f..e25b231 100644 --- a/src/xdist/plugin.py +++ b/src/xdist/plugin.py @@ -6,11 +6,7 @@ import pytest def auto_detect_cpus(): - try: - n = psutil.cpu_count(logical=False) - except NotImplementedError: - return 1 - return n if n else 1 + return psutil.cpu_count(logical=False) or psutil.cpu_count() or 1 class AutoInt(int): diff --git a/testing/test_plugin.py b/testing/test_plugin.py index 419842d..31799e2 100644 --- a/testing/test_plugin.py +++ b/testing/test_plugin.py @@ -51,10 +51,7 @@ def test_auto_detect_cpus(testdir, monkeypatch): assert config.getoption("usepdb") assert config.getoption("numprocesses") == 0 - def cpu_count_not_implemented(logical=True): - raise NotImplementedError - - monkeypatch.setattr(psutil, "cpu_count", cpu_count_not_implemented) + monkeypatch.setattr(psutil, "cpu_count", lambda logical=True: None) config = testdir.parseconfigure("-nauto") assert config.getoption("numprocesses") == 1