mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-30 22:48:07 -07:00
dev-python/psutil: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger@gmail.com> Signed-off-by: Aaron Bauman <bman@gentoo.org>
This commit is contained in:
committed by
Aaron Bauman
parent
eb96dbdc46
commit
3ed9149a99
@@ -1,96 +0,0 @@
|
||||
diff -dupr a/psutil/_pslinux.py b/psutil/_pslinux.py
|
||||
--- a/psutil/_pslinux.py 2019-11-21 17:23:01.000000000 +0100
|
||||
+++ b/psutil/_pslinux.py 2019-11-27 12:56:11.491875281 +0100
|
||||
@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False):
|
||||
fields = f.read().strip().split()
|
||||
name = os.path.basename(root)
|
||||
(reads, reads_merged, rbytes, rtime, writes, writes_merged,
|
||||
- wbytes, wtime, _, busy_time, _) = map(int, fields)
|
||||
+ wbytes, wtime, _, busy_time, _) = map(int, fields[:11])
|
||||
yield (name, reads, writes, rbytes, wbytes, rtime,
|
||||
wtime, reads_merged, writes_merged, busy_time)
|
||||
|
||||
diff -dupr a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
|
||||
--- a/psutil/tests/test_contracts.py 2019-06-20 08:10:28.000000000 +0200
|
||||
+++ b/psutil/tests/test_contracts.py 2019-11-27 12:56:11.492875227 +0100
|
||||
@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase
|
||||
|
||||
class TestDeprecations(unittest.TestCase):
|
||||
|
||||
+ @unittest.skip("broken with newer deps")
|
||||
def test_memory_info_ex(self):
|
||||
with warnings.catch_warnings(record=True) as ws:
|
||||
psutil.Process().memory_info_ex()
|
||||
diff -dupr a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
|
||||
--- a/psutil/tests/test_linux.py 2019-11-21 17:23:25.000000000 +0100
|
||||
+++ b/psutil/tests/test_linux.py 2019-11-27 13:18:19.715499797 +0100
|
||||
@@ -17,6 +17,7 @@ import re
|
||||
import shutil
|
||||
import socket
|
||||
import struct
|
||||
+import sys
|
||||
import tempfile
|
||||
import textwrap
|
||||
import time
|
||||
@@ -380,6 +381,8 @@ class TestSystemVirtualMemory(unittest.T
|
||||
ret = psutil.virtual_memory()
|
||||
assert m.called
|
||||
self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
|
||||
+ if sys.version_info < (3,):
|
||||
+ return
|
||||
w = ws[0]
|
||||
self.assertIn(
|
||||
"inactive memory stats couldn't be determined", str(w.message))
|
||||
@@ -410,6 +413,8 @@ class TestSystemVirtualMemory(unittest.T
|
||||
ret = psutil.virtual_memory()
|
||||
self.assertEqual(
|
||||
ret.available, 2057400 * 1024 + 4818144 * 1024)
|
||||
+ if sys.version_info < (3,):
|
||||
+ return
|
||||
w = ws[0]
|
||||
self.assertIn(
|
||||
"inactive memory stats couldn't be determined",
|
||||
@@ -878,7 +883,7 @@ class TestLoadAvg(unittest.TestCase):
|
||||
# =====================================================================
|
||||
|
||||
|
||||
-@unittest.skipIf(not LINUX, "LINUX only")
|
||||
+@unittest.skip('very fragile, broken with new ipaddress')
|
||||
class TestSystemNetIfAddrs(unittest.TestCase):
|
||||
|
||||
def test_ips(self):
|
||||
@@ -1363,6 +1368,7 @@ class TestMisc(unittest.TestCase):
|
||||
psutil.PROCFS_PATH = "/proc"
|
||||
os.rmdir(tdir)
|
||||
|
||||
+ @unittest.skip('fails on Gentoo')
|
||||
def test_issue_687(self):
|
||||
# In case of thread ID:
|
||||
# - pid_exists() is supposed to return False
|
||||
@@ -2090,6 +2096,7 @@ class TestProcessAgainstStatus(unittest.
|
||||
value = self.read_status_file("nonvoluntary_ctxt_switches:")
|
||||
self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
|
||||
|
||||
+ @unittest.skip('fails on Gentoo')
|
||||
def test_cpu_affinity(self):
|
||||
value = self.read_status_file("Cpus_allowed_list:")
|
||||
if '-' in str(value):
|
||||
diff -dupr a/psutil/tests/test_process.py b/psutil/tests/test_process.py
|
||||
--- a/psutil/tests/test_process.py 2019-11-22 12:37:20.000000000 +0100
|
||||
+++ b/psutil/tests/test_process.py 2019-11-27 13:07:36.966525513 +0100
|
||||
@@ -351,6 +351,7 @@ class TestProcess(unittest.TestCase):
|
||||
self.assertGreaterEqual(io2[i], 0)
|
||||
self.assertGreaterEqual(io2[i], 0)
|
||||
|
||||
+ @unittest.skip('fails if builder is ioniced already')
|
||||
@unittest.skipIf(not HAS_IONICE, "not supported")
|
||||
@unittest.skipIf(not LINUX, "linux only")
|
||||
def test_ionice_linux(self):
|
||||
@@ -1486,6 +1487,7 @@ class TestProcess(unittest.TestCase):
|
||||
d2 = clean_dict(os.environ.copy())
|
||||
self.assertEqual(d1, d2)
|
||||
|
||||
+ @unittest.skip("broken by Gentoo sandbox magic")
|
||||
@unittest.skipIf(not HAS_ENVIRON, "not supported")
|
||||
@unittest.skipIf(not POSIX, "POSIX only")
|
||||
def test_weird_environ(self):
|
||||
Reference in New Issue
Block a user