From: Zooko O'Whielacronx Date: Wed, 15 Jul 2009 01:43:38 +0000 (-0700) Subject: mac: emit the stdout and stderr from a failed call to Allmydata (this is very useful... X-Git-Tag: trac-4000~11 X-Git-Url: https://git.rkrishnan.org/pf/content/en/service/contact.html?a=commitdiff_plain;h=6cbaaf31b53c3d0075693bcf2cea439589fc116e;p=tahoe-lafs%2Ftahoe-lafs.git mac: emit the stdout and stderr from a failed call to Allmydata (this is very useful diagnostic info) --- diff --git a/misc/test_mac_diskimage.py b/misc/test_mac_diskimage.py index fc0c30f4..7795dfd1 100644 --- a/misc/test_mac_diskimage.py +++ b/misc/test_mac_diskimage.py @@ -55,11 +55,8 @@ def test_mac_diskimage(appname, version): if rc is not None: break if time.time() > deadline: - flags = fcntl.fcntl(callit.stdout.fileno(), fcntl.F_GETFL) - fcntl.fcntl(callit.stdout.fileno(), fcntl.F_SETFL, flags | os.O_NONBLOCK) - flags = fcntl.fcntl(callit.stderr.fileno(), fcntl.F_GETFL) - fcntl.fcntl(callit.stderr.fileno(), fcntl.F_SETFL, flags | os.O_NONBLOCK) - raise Exception("FAIL: it took longer than 2 seconds to invoke $appname --version-and-path. stdout: %r, stderr: %r" % (callit.stdout.read(), callit.stderr.read())) + os.kill(callitpid, 15) + raise Exception("FAIL: it took longer than 2 seconds to invoke $appname --version-and-path. stdout: %s, stderr: %s" % (callit.stdout.read(), callit.stderr.read())) time.sleep(0.05) if rc != 0: