Merge pull request #309 from greut/cpu-count

plugin: get cpu_count from sched_getaffinity

changelog/9.bugfix

@@ -0,0 +1 @@
+Fix issue of virtualized or containerized environments not reporting the number of CPUs correctly.

testing/test_plugin.py

@@ -31,7 +31,9 @@ def test_dist_options(testdir):
 
 def test_auto_detect_cpus(testdir, monkeypatch):
     import os
-    if hasattr(os, 'cpu_count'):
+    if hasattr(os, 'sched_getaffinity'):
+        monkeypatch.setattr(os, 'sched_getaffinity', lambda _pid: set(range(99)))
+    elif hasattr(os, 'cpu_count'):
         monkeypatch.setattr(os, 'cpu_count', lambda: 99)
     else:
         import multiprocessing

xdist/plugin.py

@@ -5,9 +5,16 @@ import pytest
 def parse_numprocesses(s):
     if s == 'auto':
         try:
-            from os import cpu_count
+            from os import sched_getaffinity
         except ImportError:
-            from multiprocessing import cpu_count
+            try:
+                from os import cpu_count
+            except ImportError:
+                from multiprocessing import cpu_count
+        else:
+            def cpu_count():
+                return len(sched_getaffinity(0))
+
         try:
             n = cpu_count()
         except NotImplementedError: