Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Miscellaneous test fixes #2097

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Miscellaneous test fixes #2097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8ace2c9
test_linux.py: trim possible -dirty suffix from 'free -V' output
Apr 13, 2022
369f368
test_misc.py: correctly skip test if setup.py does not exist
Apr 13, 2022
03dd0af
test_posix.py: use mountpoint as df argument, and not device
Apr 13, 2022
7dc1238
test_contracts.py: drop test for presence of io_counters
Apr 13, 2022
a245d6d
test_process.py: drop initial check for ionice class being IOPriority…
Apr 13, 2022
a589416
test_process: handle /usr/bin/tty returning /dev/ptmx
Apr 25, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions psutil/tests/test_contracts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,10 +172,6 @@ def test_ionice(self):
def test_rlimit(self):
self.assertEqual(hasattr(psutil.Process, "rlimit"), LINUX or FREEBSD)

def test_io_counters(self):
hasit = hasattr(psutil.Process, "io_counters")
self.assertEqual(hasit, False if MACOS or SUNOS else True)

def test_num_fds(self):
self.assertEqual(hasattr(psutil.Process, "num_fds"), POSIX)

Expand Down
2 changes: 1 addition & 1 deletion psutil/tests/test_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ def get_free_version_info():
out = sh(["free", "-V"]).strip()
if 'UNKNOWN' in out:
raise unittest.SkipTest("can't determine free version")
return tuple(map(int, out.split()[-1].split('.')))
return tuple(map(int, out.split()[-1].split('-')[0].split('.')))


@contextlib.contextmanager
Expand Down
2 changes: 1 addition & 1 deletion psutil/tests/test_misc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ def check(ret):
@unittest.skipIf(APPVEYOR, "temporarily disabled due to setuptools bug")
def test_setup_script(self):
setup_py = os.path.join(ROOT_DIR, 'setup.py')
if CI_TESTING and not os.path.exists(setup_py):
if CI_TESTING or not os.path.exists(setup_py):
return self.skipTest("can't find setup.py")
module = import_module_by_path(setup_py)
self.assertRaises(SystemExit, module.setup)
Expand Down
2 changes: 1 addition & 1 deletion psutil/tests/test_posix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ def df(device):
for part in psutil.disk_partitions(all=False):
usage = psutil.disk_usage(part.mountpoint)
try:
total, used, free, percent = df(part.device)
total, used, free, percent = df(part.mountpoint)
except RuntimeError as err:
# see:
# https://travis-ci.org/giampaolo/psutil/jobs/138338464
Expand Down
7 changes: 4 additions & 3 deletions psutil/tests/test_process.py
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,10 @@ def test_terminal(self):
terminal = psutil.Process().terminal()
if terminal is not None:
tty = os.path.realpath(sh('tty'))
self.assertEqual(terminal, tty)
if tty == '/dev/ptmx' and terminal.startswith('/dev/pts/'):
pass
else:
self.assertEqual(terminal, tty)

@unittest.skipIf(not HAS_PROC_IO_COUNTERS, 'not supported')
@skip_on_not_implemented(only_if=LINUX)
Expand Down Expand Up @@ -345,8 +348,6 @@ def test_io_counters(self):
@unittest.skipIf(not LINUX, "linux only")
def test_ionice_linux(self):
p = psutil.Process()
if not CI_TESTING:
self.assertEqual(p.ionice()[0], psutil.IOPRIO_CLASS_NONE)
self.assertEqual(psutil.IOPRIO_CLASS_NONE, 0)
self.assertEqual(psutil.IOPRIO_CLASS_RT, 1) # high
self.assertEqual(psutil.IOPRIO_CLASS_BE, 2) # normal
Expand Down