This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11225

dummyssh: make sure we don't inherit files descriptor to the children
ClosedPublic

Authored by marmoute on Jul 28 2021, 10:57 AM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Commits

rHGfb8389f227a0: dummyssh: make sure we don't inherit files descriptor to the children

Summary

This is one of the difference between python2 and python3 and could have been a
reason why test hang with python2 + chg. This does not seems to help the
hanging issue at all…

However, now that this is written lets reduce the difference between python2
and python3.

Diff Detail

Repository

rHG Mercurial

Branch

stable

Lint

No Linters Available

Unit

No Unit Test Coverage

Event Timeline

marmoute created this revision.Jul 28 2021, 10:57 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptJul 28 2021, 10:57 AM

Herald added a subscriber: mercurial-patches. · View Herald Transcript

marmoute added a child revision: D11226: run-tests: do not inherit file descriptor when running a command.Jul 28 2021, 10:58 AM

marmoute added a commit: rHGfb8389f227a0: dummyssh: make sure we don't inherit files descriptor to the children.Jul 30 2021, 11:11 AM

This revision was not accepted when it landed; it landed in state Needs Review.

Closed by commit rHGfb8389f227a0: dummyssh: make sure we don't inherit files descriptor to the children (authored by marmoute). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			tests/dummyssh (2 lines)

Commit	Parents	Author	Summary	Date
1b674558da53	6d79894d3460	Pierre-Yves David		Jul 28 2021, 8:55 AM

Status	Author	Revision
Closed	marmoute	D11227 run-tests: use a small timeout for chg instance
Closed	marmoute	D11226 run-tests: do not inherit file descriptor when running a command
Closed	marmoute	D11225 dummyssh: make sure we don't inherit files descriptor to the children

Diff 29732

tests/dummyssh

	hgcmd = hgcmd.replace("'", '"')			hgcmd = hgcmd.replace("'", '"')
	cmds = shlex.split(hgcmd)			cmds = shlex.split(hgcmd)
	if cmds[0].endswith('.py'):			if cmds[0].endswith('.py'):
	python_exe = os.environ['PYTHON']			python_exe = os.environ['PYTHON']
	cmds.insert(0, python_exe)			cmds.insert(0, python_exe)
	hgcmd = shlex.join(cmds)			hgcmd = shlex.join(cmds)
	# shlex generate windows incompatible string...			# shlex generate windows incompatible string...
	hgcmd = hgcmd.replace("'", '"')			hgcmd = hgcmd.replace("'", '"')
	r = subprocess.call(hgcmd, shell=True)			r = subprocess.call(hgcmd, shell=True, close_fds=True)
	sys.exit(bool(r))			sys.exit(bool(r))

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	29732		Jul 28 2021, 10:57 AM	★	★
Diff 2	29752	rHGfb8389f227a02c9facb3dc93967ffc3c78c8e7d4	Jul 28 2021, 8:55 AM	★	★