summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-12-23 23:13:31 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2020-12-23 23:13:31 +0100
commit3b823586d329e0cc26c2b9c60a746e8c1bc83a58 (patch)
tree65ef70b4b6c79ccecc0f7db28af817e75143900a
parentcca71c9028aa50bdd2bbd136f6f02f0c92524886 (diff)
downloadpsutil-3b823586d329e0cc26c2b9c60a746e8c1bc83a58.tar.gz
fix numa node count on win
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
-rw-r--r--psutil/arch/windows/cpu.c2
-rwxr-xr-xpsutil/tests/test_windows.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/psutil/arch/windows/cpu.c b/psutil/arch/windows/cpu.c
index 9fcdf746..020a9727 100644
--- a/psutil/arch/windows/cpu.c
+++ b/psutil/arch/windows/cpu.c
@@ -243,7 +243,7 @@ psutil_GetLogicalProcessorInformationEx(PyObject *self, PyObject *args) {
if (ptr->Relationship == RelationProcessorCore) {
coresCount += 1;
}
- else if (ptr->Relationship == RelationProcessorCore) {
+ else if (ptr->Relationship == RelationNumaNode) {
numaNodesCount += 1;
}
else if (ptr->Relationship == RelationProcessorPackage) {
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 77410a6c..815771bf 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -726,7 +726,7 @@ class RemoteProcessTestCase(PsutilTestCase):
p = psutil.Process(self.proc32.pid)
e = p.environ()
self.assertIn("THINK_OF_A_NUMBER", e)
- self.assertEquals(e["THINK_OF_A_NUMBER"], str(os.getpid()))
+ self.assertEqual(e["THINK_OF_A_NUMBER"], str(os.getpid()))
def test_environ_64(self):
p = psutil.Process(self.proc64.pid)