NotificationsYou must be signed in to change notification settings
Fork32.4k
Star67.9k

Commit244e37b

authored

gh-109649: Fix test_os.test_process_cpu_count_affinity() (#111689)

When CPUs are isolated on Linux, os.process_cpu_count() is smallerthan os.cpu_count(). Fix the test for this case.Example with "isolcpus=5,11 rcu_nocbs=5,11" options passed to a Linuxcommand line to isolated two logical CPUs:$ ./python -c 'import os; print(os.process_cpu_count(), "/", os.cpu_count())'10 / 12

1 parentf21b230 commit244e37bCopy full SHA for 244e37b

File tree

1 file changed

-4

lines changed

Lib/test
- test_os.py

1 file changed

-4

lines changed

`‎Lib/test/test_os.py`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -4342,8 +4342,8 @@ def test_process_cpu_count(self):`
`4342`	`4342`	`@unittest.skipUnless(hasattr(os,'sched_setaffinity'),`
`4343`	`4343`	`"don't have sched affinity support")`
`4344`	`4344`	`deftest_process_cpu_count_affinity(self):`
`4345`		`-ncpu=os.cpu_count()`
`4346`		`-ifncpuisNone:`
	`4345`	`+affinity1=os.process_cpu_count()`
	`4346`	`+ifaffinity1isNone:`
`4347`	`4347`	`self.skipTest("Could not determine the number of CPUs")`
`4348`	`4348`
`4349`	`4349`	`# Disable one CPU`
`@@ -4356,8 +4356,8 @@ def test_process_cpu_count_affinity(self):`
`4356`	`4356`	`os.sched_setaffinity(0,mask)`
`4357`	`4357`
`4358`	`4358`	`# test process_cpu_count()`
`4359`		`-affinity=os.process_cpu_count()`
`4360`		`-self.assertEqual(affinity,ncpu-1)`
	`4359`	`+affinity2=os.process_cpu_count()`
	`4360`	`+self.assertEqual(affinity2,affinity1-1)`
`4361`	`4361`
`4362`	`4362`
`4363`	`4363`	`# FD inheritance check is only useful for systems with process support.`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit244e37b

File tree

1 file changed

1 file changed

`‎Lib/test/test_os.py`

0 commit comments