Merge branch 'master' into get_open_files_threadget_open_files_thread

1 files changed, 8 insertions, 3 deletions

diff --git a/test/_bsd.py b/test/_bsd.py
index 9dfeb493..e4a3225d 100644
--- a/test/_bsd.py
+++ b/test/_bsd.py
@@ -16,7 +16,7 @@ import time
 import psutil
 
 from psutil._compat import PY3
-from test_psutil import (TOLERANCE, sh, get_test_subprocess, which,
+from test_psutil import (TOLERANCE, BSD, sh, get_test_subprocess, which,
                          retry_before_failing, reap_children, unittest)
 
 
@@ -50,6 +50,7 @@ def muse(field):
     return int(line.split()[1])
 
 
+@unittest.skipUnless(BSD, "not a BSD system")
 class BSDSpecificTestCase(unittest.TestCase):
 
     @classmethod
@@ -186,6 +187,10 @@ class BSDSpecificTestCase(unittest.TestCase):
         self.assertAlmostEqual(psutil.virtual_memory().buffers, syst,
                                delta=TOLERANCE)
 
+    def test_cpu_count_logical(self):
+        syst = sysctl("hw.ncpu")
+        self.assertEqual(psutil.cpu_count(logical=True), syst)
+
     # --- virtual_memory(); tests against muse
 
     @unittest.skipUnless(MUSE_AVAILABLE, "muse cmdline tool is not available")
@@ -236,12 +241,12 @@ class BSDSpecificTestCase(unittest.TestCase):
                                delta=TOLERANCE)
 
 
-def test_main():
+def main():
     test_suite = unittest.TestSuite()
     test_suite.addTest(unittest.makeSuite(BSDSpecificTestCase))
     result = unittest.TextTestRunner(verbosity=2).run(test_suite)
     return result.wasSuccessful()
 
 if __name__ == '__main__':
-    if not test_main():
+    if not main():
         sys.exit(1)