From: Zooko O'Whielacronx Date: Mon, 22 Dec 2008 04:06:29 +0000 (-0700) Subject: test: extend timeout on the hotline file that prevents the client from stopping itself X-Git-Url: https://git.rkrishnan.org/pf/content/en/footer/module-simplejson.scanner.html?a=commitdiff_plain;h=25d962c67d921b78b5d208887dfafbdc85be8c09;p=tahoe-lafs%2Ftahoe-lafs.git test: extend timeout on the hotline file that prevents the client from stopping itself The 20-second timeout was apparently tripped on my Powerbook G4 "draco". --- diff --git a/src/allmydata/client.py b/src/allmydata/client.py index 7022279e..a9b9a52f 100644 --- a/src/allmydata/client.py +++ b/src/allmydata/client.py @@ -292,7 +292,7 @@ class Client(node.Node, pollmixin.PollMixin): def _check_hotline(self, hotline_file): if os.path.exists(hotline_file): mtime = os.stat(hotline_file)[stat.ST_MTIME] - if mtime > time.time() - 20.0: + if mtime > time.time() - 40.0: return else: self.log("hotline file too old, shutting down") diff --git a/src/allmydata/test/test_runner.py b/src/allmydata/test/test_runner.py index df9440af..c4b86684 100644 --- a/src/allmydata/test/test_runner.py +++ b/src/allmydata/test/test_runner.py @@ -203,9 +203,9 @@ class RunNode(unittest.TestCase, pollmixin.PollMixin): out,err = StringIO(), StringIO() rc = runner.runner(argv, stdout=out, stderr=err) self.failUnlessEqual(rc, 0) - # by writing this file, we get ten seconds before the client will - # exit. This insures that even if the test fails (and the 'stop' - # command doesn't work), the client should still terminate. + # By writing this file, we get forty seconds before the client will exit. This insures + # that even if the 'stop' command doesn't work (and the test fails), the client should + # still terminate. HOTLINE_FILE = os.path.join(c1, "suicide_prevention_hotline") open(HOTLINE_FILE, "w").write("") open(os.path.join(c1, "introducer.furl"), "w").write("pb://xrndsskn2zuuian5ltnxrte7lnuqdrkz@127.0.0.1:55617/introducer\n")