+++ /dev/null
-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):
+++ /dev/null
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/ipaddress[${PYTHON_USEDEP}]
- )
-"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
- "${FILESDIR}/psutil-5.6.5-tests.patch"
-)
-
-python_test() {
- if [[ ${EPYTHON} == pypy* ]]; then
- ewarn "Not running tests on ${EPYTHON} since they are broken"
- return 0
- fi
-
- # since we are running in an environment a bit similar to CI,
- # let's skip the tests that are disable for CI
- TRAVIS=1 APPVEYOR=1 PYTHONPATH="${BUILD_DIR}/lib" ${PYTHON} psutil/tests/__main__.py || \
- die "tests failed with ${EPYTHON}"
-}
projects / gentoo.git / commitdiff