linux / cpu_count phys: take depreated */thread_siblings_list into

account

/sys/devices/system/cpu/cpu[0-9]*/topology/thread_siblings_list is
deprecated

/sys/devices/system/cpu/cpu[0-9]*/topology/core_cpus_list is the new
name

also add test which makes sure method 1 and 2 return the same result

1 files changed, 8 insertions, 0 deletions

diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 0d247aa5..b303ed6d 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -734,6 +734,14 @@ class TestSystemCPUCountPhysical(PsutilTestCase):
                 core_ids.add(fields[1])
         self.assertEqual(psutil.cpu_count(logical=False), len(core_ids))
 
+    def test_method_2(self):
+        meth_1 = psutil._pslinux.cpu_count_physical()
+        with mock.patch('glob.glob', return_value=[]) as m:
+            meth_2 = psutil._pslinux.cpu_count_physical()
+            assert m.called
+        if meth_1 is not None:
+            self.assertEqual(meth_1, meth_2)
+
     def test_emulate_none(self):
         with mock.patch('glob.glob', return_value=[]) as m1:
             with mock.patch('psutil._common.open', create=True) as m2: