https://github.com/python/cpython/commit/90dd653a6122a6c5b4b1fe5abe773c4751e5ca25
commit: 90dd653a6122a6c5b4b1fe5abe773c4751e5ca25
branch: main
author: Brian Schubert <[email protected]>
committer: serhiy-storchaka <[email protected]>
date: 2024-02-17T16:42:57Z
summary:
gh-115596: Fix ProgramPriorityTests in test_os permanently changing the process
priority (GH-115610)
files:
A Misc/NEWS.d/next/Tests/2024-02-17-08-25-01.gh-issue-115596.RGPCrR.rst
M Lib/test/test_os.py
diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
index ce778498c61d87..2372ac4c21efd9 100644
--- a/Lib/test/test_os.py
+++ b/Lib/test/test_os.py
@@ -3506,23 +3506,22 @@ class ProgramPriorityTests(unittest.TestCase):
"""Tests for os.getpriority() and os.setpriority()."""
def test_set_get_priority(self):
-
base = os.getpriority(os.PRIO_PROCESS, os.getpid())
- os.setpriority(os.PRIO_PROCESS, os.getpid(), base + 1)
- try:
- new_prio = os.getpriority(os.PRIO_PROCESS, os.getpid())
- # nice value cap is 19 for linux and 20 for FreeBSD
- if base >= 19 and new_prio <= base:
- raise unittest.SkipTest("unable to reliably test setpriority "
- "at current nice level of %s" % base)
- else:
- self.assertEqual(new_prio, base + 1)
- finally:
- try:
- os.setpriority(os.PRIO_PROCESS, os.getpid(), base)
- except OSError as err:
- if err.errno != errno.EACCES:
- raise
+ code = f"""if 1:
+ import os
+ os.setpriority(os.PRIO_PROCESS, os.getpid(), {base} + 1)
+ print(os.getpriority(os.PRIO_PROCESS, os.getpid()))
+ """
+
+ # Subprocess inherits the current process' priority.
+ _, out, _ = assert_python_ok("-c", code)
+ new_prio = int(out)
+ # nice value cap is 19 for linux and 20 for FreeBSD
+ if base >= 19 and new_prio <= base:
+ raise unittest.SkipTest("unable to reliably test setpriority "
+ "at current nice level of %s" % base)
+ else:
+ self.assertEqual(new_prio, base + 1)
@unittest.skipUnless(hasattr(os, 'sendfile'), "test needs os.sendfile()")
diff --git
a/Misc/NEWS.d/next/Tests/2024-02-17-08-25-01.gh-issue-115596.RGPCrR.rst
b/Misc/NEWS.d/next/Tests/2024-02-17-08-25-01.gh-issue-115596.RGPCrR.rst
new file mode 100644
index 00000000000000..2bcb8b9ac6bcd4
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2024-02-17-08-25-01.gh-issue-115596.RGPCrR.rst
@@ -0,0 +1,2 @@
+Fix ``ProgramPriorityTests`` in ``test_os`` permanently changing the process
+priority.
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
