Commitc35b812

authored

gh-142836: Avoid /proc fd pipes on Solaris (#142853)

1 parent89729f2 commitc35b812Copy full SHA for c35b812

File tree

+13

-1

lines changed

+13

-1

lines changed

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3563,10 +3563,22 @@ def _assert_find_function(self, file_content, func_name, expected):`
`3563`	`3563`
`3564`	`3564`	`def_fd_dir_for_pipe_targets(self):`
`3565`	`3565`	`"""Return a directory exposing live file descriptors, if any."""`
	`3566`	`+returnself._proc_fd_dir()orself._dev_fd_dir()`
	`3567`	`+`
	`3568`	`+def_proc_fd_dir(self):`
	`3569`	`+"""Return /proc-backed fd dir when it can be used for pipes."""`
	`3570`	`+# GH-142836: Opening /proc/self/fd entries for pipes raises EACCES on`
	`3571`	`+# Solaris, so prefer other mechanisms there.`
	`3572`	`+ifsys.platform.startswith("sunos"):`
	`3573`	`+returnNone`
	`3574`	`+`
`3566`	`3575`	`proc_fd="/proc/self/fd"`
`3567`	`3576`	`ifos.path.isdir(proc_fd)andos.path.exists(os.path.join(proc_fd,'0')):`
`3568`	`3577`	`returnproc_fd`
	`3578`	`+returnNone`
`3569`	`3579`
	`3580`	`+def_dev_fd_dir(self):`
	`3581`	`+"""Return /dev-backed fd dir when usable."""`
`3570`	`3582`	`dev_fd="/dev/fd"`
`3571`	`3583`	`ifos.path.isdir(dev_fd)andos.path.exists(os.path.join(dev_fd,'0')):`
`3572`	`3584`	`ifsys.platform.startswith("freebsd"):`
`@@ -3576,7 +3588,6 @@ def _fd_dir_for_pipe_targets(self):`
`3576`	`3588`	`exceptFileNotFoundError:`
`3577`	`3589`	`returnNone`
`3578`	`3590`	`returndev_fd`
`3579`		`-`
`3580`	`3591`	`returnNone`
`3581`	`3592`
`3582`	`3593`	`deftest_find_function_empty_file(self):`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	+Accommodated Solaris in ``test_pdb.test_script_target_anonymous_pipe``.

Comments

(0)