Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/4368c4c04268f6528eb8bcc1ff83ee679f6f13bf
...commit
http://git.netsurf-browser.org/netsurf.git/commit/4368c4c04268f6528eb8bcc1ff83ee679f6f13bf
...tree
http://git.netsurf-browser.org/netsurf.git/tree/4368c4c04268f6528eb8bcc1ff83ee679f6f13bf
The branch, master has been updated
via 4368c4c04268f6528eb8bcc1ff83ee679f6f13bf (commit)
from a57940a468e7abd65cc2d69d3f8a167b0f4e4dfc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=4368c4c04268f6528eb8bcc1ff83ee679f6f13bf
commit 4368c4c04268f6528eb8bcc1ff83ee679f6f13bf
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
attempt to make monkeyfarmer process exit detection more reliable
diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py
index b863721..9494343 100644
--- a/test/monkeyfarmer.py
+++ b/test/monkeyfarmer.py
@@ -64,18 +64,18 @@ class MonkeyFarmer(asyncore.dispatcher):
def handle_close(self):
# the pipe to the monkey process has closed
- # ensure the child process is finished and report the exit
self.close()
- if self.monkey.poll() is None:
- self.monkey.terminate()
- self.monkey.wait()
- self.lines.insert(0, "GENERIC EXIT
{}".format(self.monkey.returncode).encode('utf-8'))
def handle_read(self):
got = self.recv(8192)
if not got:
self.deadmonkey = True
+ # ensure the child process is finished and report the exit
+ if self.monkey.poll() is None:
+ self.monkey.terminate()
+ self.monkey.wait()
+ self.lines.insert(0, "GENERIC EXIT
{}".format(self.monkey.returncode).encode('utf-8'))
return
self.incoming += got
if b"\n" in self.incoming:
-----------------------------------------------------------------------
Summary of changes:
test/monkeyfarmer.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/test/monkeyfarmer.py b/test/monkeyfarmer.py
index b863721..9494343 100644
--- a/test/monkeyfarmer.py
+++ b/test/monkeyfarmer.py
@@ -64,18 +64,18 @@ class MonkeyFarmer(asyncore.dispatcher):
def handle_close(self):
# the pipe to the monkey process has closed
- # ensure the child process is finished and report the exit
self.close()
- if self.monkey.poll() is None:
- self.monkey.terminate()
- self.monkey.wait()
- self.lines.insert(0, "GENERIC EXIT
{}".format(self.monkey.returncode).encode('utf-8'))
def handle_read(self):
got = self.recv(8192)
if not got:
self.deadmonkey = True
+ # ensure the child process is finished and report the exit
+ if self.monkey.poll() is None:
+ self.monkey.terminate()
+ self.monkey.wait()
+ self.lines.insert(0, "GENERIC EXIT
{}".format(self.monkey.returncode).encode('utf-8'))
return
self.incoming += got
if b"\n" in self.incoming:
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
