| 1 |
commit: 3ed9149a99d6668fb344f1e273f4103a82daec1f |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue May 19 19:23:26 2020 +0000 |
| 4 |
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jun 2 04:28:01 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ed9149a |
| 7 |
|
| 8 |
dev-python/psutil: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 11 |
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-python/psutil/files/psutil-5.6.7-tests.patch | 96 ------------------------ |
| 14 |
1 file changed, 96 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-python/psutil/files/psutil-5.6.7-tests.patch b/dev-python/psutil/files/psutil-5.6.7-tests.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 3e6ec254c19..00000000000 |
| 19 |
--- a/dev-python/psutil/files/psutil-5.6.7-tests.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,96 +0,0 @@ |
| 22 |
-diff -dupr a/psutil/_pslinux.py b/psutil/_pslinux.py |
| 23 |
---- a/psutil/_pslinux.py 2019-11-21 17:23:01.000000000 +0100 |
| 24 |
-+++ b/psutil/_pslinux.py 2019-11-27 12:56:11.491875281 +0100 |
| 25 |
-@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False): |
| 26 |
- fields = f.read().strip().split() |
| 27 |
- name = os.path.basename(root) |
| 28 |
- (reads, reads_merged, rbytes, rtime, writes, writes_merged, |
| 29 |
-- wbytes, wtime, _, busy_time, _) = map(int, fields) |
| 30 |
-+ wbytes, wtime, _, busy_time, _) = map(int, fields[:11]) |
| 31 |
- yield (name, reads, writes, rbytes, wbytes, rtime, |
| 32 |
- wtime, reads_merged, writes_merged, busy_time) |
| 33 |
- |
| 34 |
-diff -dupr a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py |
| 35 |
---- a/psutil/tests/test_contracts.py 2019-06-20 08:10:28.000000000 +0200 |
| 36 |
-+++ b/psutil/tests/test_contracts.py 2019-11-27 12:56:11.492875227 +0100 |
| 37 |
-@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase |
| 38 |
- |
| 39 |
- class TestDeprecations(unittest.TestCase): |
| 40 |
- |
| 41 |
-+ @unittest.skip("broken with newer deps") |
| 42 |
- def test_memory_info_ex(self): |
| 43 |
- with warnings.catch_warnings(record=True) as ws: |
| 44 |
- psutil.Process().memory_info_ex() |
| 45 |
-diff -dupr a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py |
| 46 |
---- a/psutil/tests/test_linux.py 2019-11-21 17:23:25.000000000 +0100 |
| 47 |
-+++ b/psutil/tests/test_linux.py 2019-11-27 13:18:19.715499797 +0100 |
| 48 |
-@@ -17,6 +17,7 @@ import re |
| 49 |
- import shutil |
| 50 |
- import socket |
| 51 |
- import struct |
| 52 |
-+import sys |
| 53 |
- import tempfile |
| 54 |
- import textwrap |
| 55 |
- import time |
| 56 |
-@@ -380,6 +381,8 @@ class TestSystemVirtualMemory(unittest.T |
| 57 |
- ret = psutil.virtual_memory() |
| 58 |
- assert m.called |
| 59 |
- self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024) |
| 60 |
-+ if sys.version_info < (3,): |
| 61 |
-+ return |
| 62 |
- w = ws[0] |
| 63 |
- self.assertIn( |
| 64 |
- "inactive memory stats couldn't be determined", str(w.message)) |
| 65 |
-@@ -410,6 +413,8 @@ class TestSystemVirtualMemory(unittest.T |
| 66 |
- ret = psutil.virtual_memory() |
| 67 |
- self.assertEqual( |
| 68 |
- ret.available, 2057400 * 1024 + 4818144 * 1024) |
| 69 |
-+ if sys.version_info < (3,): |
| 70 |
-+ return |
| 71 |
- w = ws[0] |
| 72 |
- self.assertIn( |
| 73 |
- "inactive memory stats couldn't be determined", |
| 74 |
-@@ -878,7 +883,7 @@ class TestLoadAvg(unittest.TestCase): |
| 75 |
- # ===================================================================== |
| 76 |
- |
| 77 |
- |
| 78 |
--@××××××××.skipIf(not LINUX, "LINUX only") |
| 79 |
-+@××××××××.skip('very fragile, broken with new ipaddress') |
| 80 |
- class TestSystemNetIfAddrs(unittest.TestCase): |
| 81 |
- |
| 82 |
- def test_ips(self): |
| 83 |
-@@ -1363,6 +1368,7 @@ class TestMisc(unittest.TestCase): |
| 84 |
- psutil.PROCFS_PATH = "/proc" |
| 85 |
- os.rmdir(tdir) |
| 86 |
- |
| 87 |
-+ @unittest.skip('fails on Gentoo') |
| 88 |
- def test_issue_687(self): |
| 89 |
- # In case of thread ID: |
| 90 |
- # - pid_exists() is supposed to return False |
| 91 |
-@@ -2090,6 +2096,7 @@ class TestProcessAgainstStatus(unittest. |
| 92 |
- value = self.read_status_file("nonvoluntary_ctxt_switches:") |
| 93 |
- self.assertEqual(self.proc.num_ctx_switches().involuntary, value) |
| 94 |
- |
| 95 |
-+ @unittest.skip('fails on Gentoo') |
| 96 |
- def test_cpu_affinity(self): |
| 97 |
- value = self.read_status_file("Cpus_allowed_list:") |
| 98 |
- if '-' in str(value): |
| 99 |
-diff -dupr a/psutil/tests/test_process.py b/psutil/tests/test_process.py |
| 100 |
---- a/psutil/tests/test_process.py 2019-11-22 12:37:20.000000000 +0100 |
| 101 |
-+++ b/psutil/tests/test_process.py 2019-11-27 13:07:36.966525513 +0100 |
| 102 |
-@@ -351,6 +351,7 @@ class TestProcess(unittest.TestCase): |
| 103 |
- self.assertGreaterEqual(io2[i], 0) |
| 104 |
- self.assertGreaterEqual(io2[i], 0) |
| 105 |
- |
| 106 |
-+ @unittest.skip('fails if builder is ioniced already') |
| 107 |
- @unittest.skipIf(not HAS_IONICE, "not supported") |
| 108 |
- @unittest.skipIf(not LINUX, "linux only") |
| 109 |
- def test_ionice_linux(self): |
| 110 |
-@@ -1486,6 +1487,7 @@ class TestProcess(unittest.TestCase): |
| 111 |
- d2 = clean_dict(os.environ.copy()) |
| 112 |
- self.assertEqual(d1, d2) |
| 113 |
- |
| 114 |
-+ @unittest.skip("broken by Gentoo sandbox magic") |
| 115 |
- @unittest.skipIf(not HAS_ENVIRON, "not supported") |
| 116 |
- @unittest.skipIf(not POSIX, "POSIX only") |
| 117 |
- def test_weird_environ(self): |
Archives