Mercurial > hg
view tests/test-bugzilla.t @ 31063:18fb3cf572b4 stable
worker: ignore meaningless exit status indication returned by os.waitpid()
Before this patch, worker implementation assumes that os.waitpid()
with os.WNOHANG returns '(0, 0)' for still running child process. This
is explicitly specified as below in Python API document.
os.WNOHANG
The option for waitpid() to return immediately if no child
process status is available immediately. The function returns
(0, 0) in this case.
On the other hand, POSIX specification doesn't define the "stat_loc"
value returned by waitpid() with WNOHANG for such child process.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/waitpid.html
CPython implementation for os.waitpid() on POSIX doesn't take any care
of this gap, and this may cause unexpected "exit status indication"
even on POSIX conformance platform.
For example, os.waitpid() with os.WNOHANG returns non-zero "exit
status indication" on FreeBSD. This implies os.kill() with own pid or
sys.exit() with non-zero exit code, even if no child process fails.
To ignore meaningless exit status indication returned by os.waitpid(),
this patch skips subsequent steps forcibly, if os.waitpid() returns 0
as pid.
This patch also arranges examination of 'p' value for readability.
FYI, there are some issues below about this behavior reported for
CPython.
https://bugs.python.org/issue21791
https://bugs.python.org/issue27808
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Sat, 25 Feb 2017 01:07:52 +0900 |
parents | 22c53b3a390d |
children | fbfecd1dbfb5 |
line wrap: on
line source
mock bugzilla driver for testing template output: $ cat <<EOF > bzmock.py > from __future__ import absolute_import > from mercurial import extensions > > def extsetup(ui): > bugzilla = extensions.find('bugzilla') > class bzmock(bugzilla.bzaccess): > def __init__(self, ui): > super(bzmock, self).__init__(ui) > self._logfile = ui.config('bugzilla', 'mocklog') > def updatebug(self, bugid, newstate, text, committer): > with open(self._logfile, 'a') as f: > f.write('update bugid=%r, newstate=%r, committer=%r\n' > % (bugid, newstate, committer)) > f.write('----\n' + text + '\n----\n') > def notify(self, bugs, committer): > with open(self._logfile, 'a') as f: > f.write('notify bugs=%r, committer=%r\n' > % (bugs, committer)) > bugzilla.bugzilla._versions['mock'] = bzmock > EOF set up mock repository: $ hg init mockremote $ cat <<EOF > mockremote/.hg/hgrc > [extensions] > bugzilla = > bzmock = $TESTTMP/bzmock.py > > [bugzilla] > version = mock > mocklog = $TESTTMP/bzmock.log > > [hooks] > incoming.bugzilla = python:hgext.bugzilla.hook > > [web] > baseurl=http://example.org/hg > > %include $TESTTMP/bzstyle.hgrc > EOF $ hg clone -q mockremote mocklocal push with default template: $ echo '[bugzilla]' > bzstyle.hgrc $ echo foo > mocklocal/foo $ hg ci -R mocklocal -Aqm 'Fixes bug 123' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=123, newstate={}, committer='test' ---- changeset 7875a8342c6f in repo $TESTTMP/mockremote refers to bug 123. (glob) details: Fixes bug 123 ---- notify bugs={123: {}}, committer='test' push with style: $ cat <<EOF > bzstyle.map > changeset = "{node|short} refers to bug {bug}." > EOF $ echo "style = $TESTTMP/bzstyle.map" >> bzstyle.hgrc $ echo foo >> mocklocal/foo $ hg ci -R mocklocal -qm 'Fixes bug 456' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=456, newstate={}, committer='test' ---- 2808b172464b refers to bug 456. ---- notify bugs={456: {}}, committer='test' push with template (overrides style): $ cat <<EOF >> bzstyle.hgrc > template = Changeset {node|short} in {root|basename}. > {hgweb}/rev/{node|short}\n > {desc} > EOF $ echo foo >> mocklocal/foo $ hg ci -R mocklocal -qm 'Fixes bug 789' $ hg -R mocklocal push -q $ cat bzmock.log && rm bzmock.log update bugid=789, newstate={}, committer='test' ---- Changeset a770f3e409f2 in mockremote. http://example.org/hg/rev/a770f3e409f2 Fixes bug 789 ---- notify bugs={789: {}}, committer='test'