]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
[3.11] Fix ProgramPriorityTests on FreeBSD with high nice value (GH-100145) (GH-115615)
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Sat, 17 Feb 2024 15:38:38 +0000 (16:38 +0100)
committerGitHub <noreply@github.com>
Sat, 17 Feb 2024 15:38:38 +0000 (15:38 +0000)
It expects priority to be capped with 19, which is the cap for Linux,
but for FreeBSD the cap is 20 and the test fails under the similar
conditions. Tweak the condition to cover FreeBSD as well.
(cherry picked from commit 437924465de5cb81988d1e580797b07090c26a28)

Co-authored-by: Dmitry Marakasov <amdmi3@amdmi3.ru>
Lib/test/test_os.py

index b26a9359b0a19b542d949d57165b3bbdf2b8f20d..8a4d598a8f70bc21c68efd25bc4e6380b423ccf6 100644 (file)
@@ -3325,7 +3325,8 @@ class ProgramPriorityTests(unittest.TestCase):
         os.setpriority(os.PRIO_PROCESS, os.getpid(), base + 1)
         try:
             new_prio = os.getpriority(os.PRIO_PROCESS, os.getpid())
-            if base >= 19 and new_prio <= 19:
+            # 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: