NotificationsYou must be signed in to change notification settings
Fork33.3k
Star69.7k

Commitca47b6f

committed

fix the hang on macOS by removing part of the test.

I'm not sure _why_ the hang happened, the forkserver process wasn't exiting whenthe alive_w fd was closed in the parent during tearDownModule(), instead it remainedin its selector() loop. regardless the part of the test this removes fixes it andit only happened on macOS.

1 parent8c5f7f4 commitca47b6fCopy full SHA for ca47b6f

File tree

2 files changed

-10

lines changed

Lib
- multiprocessing
  - forkserver.py
- test
  - _test_multiprocessing.py

2 files changed

-10

lines changed

`‎Lib/multiprocessing/forkserver.py‎`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -302,10 +302,10 @@ def sigchld_handler(*_unused):`
`302`	`302`	`wrapped_s,authkey)`
`303`	`303`	`finally:`
`304`	`304`	`wrapped_s._detach()`
	`305`	`+delwrapped_s`
`305`	`306`	`# Receive fds from client`
`306`	`307`	`fds=reduction.recvfds(s,MAXFDS_TO_SEND+1)`
`307`		`-except (EOFError,OSError,AuthenticationError):`
`308`		`-# broken pipe or failed authentication`
	`308`	`+except (EOFError,BrokenPipeError,AuthenticationError):`
`309`	`309`	`s.close()`
`310`	`310`	`continue`
`311`	`311`	`iflen(fds)>MAXFDS_TO_SEND:`

`‎Lib/test/_test_multiprocessing.py‎`

Lines changed: 0 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -871,14 +871,6 @@ def test_forkserver_without_auth_fails(self):`
`871`	`871`	`authkey_len=len(forkserver._forkserver_authkey)`
`872`	`872`	`withunittest.mock.patch.object(`
`873`	`873`	`forkserver,'_forkserver_authkey',None):`
`874`		`-# With no auth handshake, the connection this makes to the`
`875`		`-# forkserver will fail to do the file descriptor transfer`
`876`		`-# over the pipe as the forkserver is expecting auth.`
`877`		`-proc=self.Process(target=self._exit_process)`
`878`		`-withself.assertRaisesRegex(RuntimeError,'not receive ack'):`
`879`		`-proc.start()`
`880`		`-delproc`
`881`		`-`
`882`	`874`	`# With an incorrect authkey we should get an auth rejection`
`883`	`875`	`# rather than the above protocol error.`
`884`	`876`	`forkserver._forkserver_authkey=b'T'*authkey_len`

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!

Commitca47b6f

File tree

2 files changed

2 files changed

`‎Lib/multiprocessing/forkserver.py‎`

`‎Lib/test/_test_multiprocessing.py‎`

0 commit comments