133 lines
5.5 KiB
Diff
133 lines
5.5 KiB
Diff
|
Index: psutil-5.6.3/psutil/tests/__init__.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/__init__.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/__init__.py
|
||
|
|
@@ -171,7 +171,7 @@ HAS_SENSORS_BATTERY = hasattr(psutil, "s
|
||
|
|
try:
|
||
|
|
HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery())
|
||
|
|
except Exception:
|
||
|
|
- HAS_BATTERY = True
|
||
|
|
+ HAS_BATTERY = False
|
||
|
|
HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans")
|
||
|
|
HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures")
|
||
|
|
HAS_THREADS = hasattr(psutil.Process, "threads")
|
||
|
|
Index: psutil-5.6.3/psutil/tests/test_misc.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/test_misc.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/test_misc.py
|
||
|
|
@@ -680,7 +680,7 @@ class TestScripts(unittest.TestCase):
|
||
|
|
src = f.read()
|
||
|
|
ast.parse(src)
|
||
|
|
|
||
|
|
- def test_coverage(self):
|
||
|
|
+ def _test_coverage(self):
|
||
|
|
# make sure all example scripts have a test method defined
|
||
|
|
meths = dir(self)
|
||
|
|
for name in os.listdir(SCRIPTS_DIR):
|
||
|
|
@@ -698,7 +698,7 @@ class TestScripts(unittest.TestCase):
|
||
|
|
if not stat.S_IXUSR & os.stat(path)[stat.ST_MODE]:
|
||
|
|
self.fail('%r is not executable' % path)
|
||
|
|
|
||
|
|
- def test_disk_usage(self):
|
||
|
|
+ def _test_disk_usage(self):
|
||
|
|
self.assert_stdout('disk_usage.py')
|
||
|
|
|
||
|
|
def test_free(self):
|
||
|
|
@@ -777,6 +777,8 @@ class TestScripts(unittest.TestCase):
|
||
|
|
def test_battery(self):
|
||
|
|
self.assert_stdout('battery.py')
|
||
|
|
|
||
|
|
+ @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported")
|
||
|
|
+ @unittest.skipIf(not HAS_BATTERY, "no battery")
|
||
|
|
def test_sensors(self):
|
||
|
|
self.assert_stdout('sensors.py')
|
||
|
|
|
||
|
|
Index: psutil-5.6.3/psutil/tests/test_linux.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/test_linux.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/test_linux.py
|
||
|
|
@@ -633,7 +633,7 @@ class TestSystemCPUCountLogical(unittest
|
||
|
|
self.assertEqual(psutil.cpu_count(logical=True), num)
|
||
|
|
|
||
|
|
@unittest.skipIf(not which("lscpu"), "lscpu utility not available")
|
||
|
|
- def test_against_lscpu(self):
|
||
|
|
+ def _test_against_lscpu(self):
|
||
|
|
out = sh("lscpu -p")
|
||
|
|
num = len([x for x in out.split('\n') if not x.startswith('#')])
|
||
|
|
self.assertEqual(psutil.cpu_count(logical=True), num)
|
||
|
|
@@ -676,7 +676,7 @@ class TestSystemCPUCountLogical(unittest
|
||
|
|
class TestSystemCPUCountPhysical(unittest.TestCase):
|
||
|
|
|
||
|
|
@unittest.skipIf(not which("lscpu"), "lscpu utility not available")
|
||
|
|
- def test_against_lscpu(self):
|
||
|
|
+ def _test_against_lscpu(self):
|
||
|
|
out = sh("lscpu -p")
|
||
|
|
core_ids = set()
|
||
|
|
for line in out.split('\n'):
|
||
|
|
@@ -1027,7 +1027,7 @@ class TestSystemDiskPartitions(unittest.
|
||
|
|
|
||
|
|
@unittest.skipIf(not hasattr(os, 'statvfs'), "os.statvfs() not available")
|
||
|
|
@skip_on_not_implemented()
|
||
|
|
- def test_against_df(self):
|
||
|
|
+ def _test_against_df(self):
|
||
|
|
# test psutil.disk_usage() and psutil.disk_partitions()
|
||
|
|
# against "df -a"
|
||
|
|
def df(path):
|
||
|
|
@@ -1203,7 +1203,7 @@ class TestSystemDiskIoCounters(unittest.
|
||
|
|
self.assertEqual(ret.read_count, 1)
|
||
|
|
self.assertEqual(ret.write_count, 5)
|
||
|
|
|
||
|
|
- def test_emulate_use_sysfs(self):
|
||
|
|
+ def _test_emulate_use_sysfs(self):
|
||
|
|
def exists(path):
|
||
|
|
if path == '/proc/diskstats':
|
||
|
|
return False
|
||
|
|
Index: psutil-5.6.3/psutil/tests/test_posix.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/test_posix.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/test_posix.py
|
||
|
|
@@ -415,7 +415,7 @@ class TestSystemAPIs(unittest.TestCase):
|
||
|
|
|
||
|
|
# AIX can return '-' in df output instead of numbers, e.g. for /proc
|
||
|
|
@unittest.skipIf(AIX, "unreliable on AIX")
|
||
|
|
- def test_disk_usage(self):
|
||
|
|
+ def _test_disk_usage(self):
|
||
|
|
def df(device):
|
||
|
|
out = sh("df -k %s" % device).strip()
|
||
|
|
line = out.split('\n')[1]
|
||
|
|
Index: psutil-5.6.3/psutil/tests/test_contracts.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/test_contracts.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/test_contracts.py
|
||
|
|
@@ -110,7 +110,7 @@ class TestAvailability(unittest.TestCase
|
||
|
|
ae(hasattr(psutil, "RLIMIT_RTTIME"), hasit)
|
||
|
|
ae(hasattr(psutil, "RLIMIT_SIGPENDING"), hasit)
|
||
|
|
|
||
|
|
- def test_cpu_freq(self):
|
||
|
|
+ def _test_cpu_freq(self):
|
||
|
|
linux = (LINUX and
|
||
|
|
(os.path.exists("/sys/devices/system/cpu/cpufreq") or
|
||
|
|
os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq")))
|
||
|
|
Index: psutil-5.6.3/psutil/tests/test_system.py
|
||
|
|
===================================================================
|
||
|
|
--- psutil-5.6.3.orig/psutil/tests/test_system.py
|
||
|
|
+++ psutil-5.6.3/psutil/tests/test_system.py
|
||
|
|
@@ -481,7 +481,7 @@ class TestSystemAPIs(unittest.TestCase):
|
||
|
|
def test_disk_usage_bytes(self):
|
||
|
|
psutil.disk_usage(b'.')
|
||
|
|
|
||
|
|
- def test_disk_partitions(self):
|
||
|
|
+ def _test_disk_partitions(self):
|
||
|
|
# all = False
|
||
|
|
ls = psutil.disk_partitions(all=False)
|
||
|
|
# on travis we get:
|
||
|
|
@@ -685,7 +685,7 @@ class TestSystemAPIs(unittest.TestCase):
|
||
|
|
'/proc/diskstats not available on this linux version')
|
||
|
|
@unittest.skipIf(APPVEYOR and psutil.disk_io_counters() is None,
|
||
|
|
"unreliable on APPVEYOR") # no visible disks
|
||
|
|
- def test_disk_io_counters(self):
|
||
|
|
+ def _test_disk_io_counters(self):
|
||
|
|
def check_ntuple(nt):
|
||
|
|
self.assertEqual(nt[0], nt.read_count)
|
||
|
|
self.assertEqual(nt[1], nt.write_count)
|