1 files changed, 0 insertions, 90 deletions
diff --git a/dev-python/psutil/files/psutil-5.6.5-tests.patch b/dev-python/psutil/files/psutil-5.6.5-tests.patch
deleted file mode 100644
index ab06ffd069b6..000000000000
--- a/dev-python/psutil/files/psutil-5.6.5-tests.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
-index 80fbf8bf..13c195b8 100644
---- a/psutil/_pslinux.py
-+++ b/psutil/_pslinux.py
-@@ -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 --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
-index cb4a2b96..1ff7f6ca 100755
---- a/psutil/tests/test_contracts.py
-+++ b/psutil/tests/test_contracts.py
-@@ -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 --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index ccde735d..db7183af 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -380,9 +380,10 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                 ret = psutil.virtual_memory()
-             assert m.called
-             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
--            w = ws[0]
--            self.assertIn(
--                "inactive memory stats couldn't be determined", str(w.message))
-+            # i have no idea what they are trying to do here
-+            #w = ws[0]
-+            #self.assertIn(
-+            #    "inactive memory stats couldn't be determined", str(w.message))
- 
-     def test_avail_old_missing_zoneinfo(self):
-         # Remove /proc/zoneinfo file. Make sure fallback is used
-@@ -410,10 +411,12 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                     ret = psutil.virtual_memory()
-                     self.assertEqual(
-                         ret.available, 2057400 * 1024 + 4818144 * 1024)
--                    w = ws[0]
--                    self.assertIn(
--                        "inactive memory stats couldn't be determined",
--                        str(w.message))
-+
-+                    # i have no idea what they are trying to do here
-+                    #w = ws[0]
-+                    #self.assertIn(
-+                    #    "inactive memory stats couldn't be determined",
-+                    #    str(w.message))
- 
-     def test_virtual_memory_mocked(self):
-         # Emulate /proc/meminfo because neither vmstat nor free return slab.
-@@ -878,7 +881,7 @@ class TestLoadAvg(unittest.TestCase):
- # =====================================================================
- 
- 
--@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skipIf(not LINUX or True, "Not working with latest ipaddress")
- class TestSystemNetIfAddrs(unittest.TestCase):
- 
-     def test_ips(self):
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index 24a29b5a..9d9d36d2 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -950,7 +950,7 @@ class TestProcess(unittest.TestCase):
- 
-         for combo in combos:
-             p.cpu_affinity(combo)
--            self.assertEqual(p.cpu_affinity(), combo)
-+            self.assertEqual(set(p.cpu_affinity()), set(combo))
- 
-     # TODO: #595
-     @unittest.skipIf(BSD, "broken on BSD")
-@@ -1486,6 +1486,7 @@ class TestProcess(unittest.TestCase):
-         d2 = clean_dict(os.environ.copy())
-         self.assertEqual(d1, d2)
- 
-+    @unittest.skipIf(TRAVIS, "broken under sandbox, using TRAVIS for Gentoo")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):