self._check_right_code(lines[1])
d.addCallback(_cb)
return d
+ # The timeout was exceeded on FreeStorm's CentOS:
+ # http://tahoe-lafs.org/buildbot/builders/FreeStorm%20CentOS5-i386/builds/503/steps/test/logs/stdio
+ test_import_in_repl.timeout = 480
def test_path(self):
d = self.run_bintahoe(["--version-and-path"])
# 'create-node', and disabled for 'create-client'.
tahoe_cfg = os.path.join(n1, "tahoe.cfg")
self.failUnless(os.path.exists(tahoe_cfg))
- content = open(tahoe_cfg).read()
+ content = fileutil.read(tahoe_cfg).replace('\r\n', '\n')
if kind == "client":
self.failUnless(re.search(r"\n\[storage\]\n#.*\nenabled = false\n", content), content)
else:
self.failUnless(re.search(r"\n\[storage\]\n#.*\nenabled = true\n", content), content)
self.failUnless("\nreserved_space = 1G\n" in content)
+ self.failUnless(re.search(r"\n\[drop_upload\]\n#.*\nenabled = false\n", content), content)
+
# creating the node a second time should be rejected
rc, out, err = self.run_tahoe(argv)
self.failIfEqual(rc, 0, str((out, err, rc)))
run_by_human=False)
-BASECONFIG_I = ("[client]\n"
- "introducer.furl = %s\n"
- )
-
class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
RunBinTahoeMixin):
# exercise "tahoe start", for both introducer, client node, and
HOTLINE_FILE = os.path.join(c1, "suicide_prevention_hotline")
TWISTD_PID_FILE = os.path.join(c1, "twistd.pid")
INTRODUCER_FURL_FILE = os.path.join(c1, "introducer.furl")
+ PORTNUM_FILE = os.path.join(c1, "introducer.port")
+ NODE_URL_FILE = os.path.join(c1, "node.url")
+ CONFIG_FILE = os.path.join(c1, "tahoe.cfg")
d = self.run_bintahoe(["--quiet", "create-introducer", "--basedir", c1])
def _cb(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0)
+
+ # This makes sure that node.url is written, which allows us to
+ # detect when the introducer restarts in _node_has_restarted below.
+ config = fileutil.read(CONFIG_FILE)
+ self.failUnlessIn('\nweb.port = \n', config)
+ fileutil.write(CONFIG_FILE, config.replace('\nweb.port = \n', '\nweb.port = 0\n'))
+
# by writing this file, we get ten seconds before the node will
# exit. This insures that even if the test fails (and the 'stop'
# command doesn't work), the client should still terminate.
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
# now it's safe to start the node
d.addCallback(_cb)
def _cb2(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr)
d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res):
- open(HOTLINE_FILE, "w").write("")
+ # read the introducer.furl and introducer.port files so we can check that their
+ # contents don't change on restart
+ self.furl = fileutil.read(INTRODUCER_FURL_FILE)
+ self.failUnless(os.path.exists(PORTNUM_FILE))
+ self.portnum = fileutil.read(PORTNUM_FILE)
+
+ fileutil.write(HOTLINE_FILE, "")
self.failUnless(os.path.exists(TWISTD_PID_FILE))
+ self.failUnless(os.path.exists(NODE_URL_FILE))
+
# rm this so we can detect when the second incarnation is ready
- os.unlink(INTRODUCER_FURL_FILE)
+ os.unlink(NODE_URL_FILE)
return self.run_bintahoe(["--quiet", "restart", c1])
d.addCallback(_started)
def _then(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr)
d.addCallback(_then)
# again, the second incarnation of the node might not be ready yet,
- # so poll until it is
- d.addCallback(lambda res: self.poll(_node_has_started))
+ # so poll until it is. This time INTRODUCER_FURL_FILE already
+ # exists, so we check for the existence of NODE_URL_FILE instead.
+ def _node_has_restarted():
+ return os.path.exists(NODE_URL_FILE) and os.path.exists(PORTNUM_FILE)
+ d.addCallback(lambda res: self.poll(_node_has_restarted))
+
+ def _check_same_furl_and_port(res):
+ self.failUnless(os.path.exists(INTRODUCER_FURL_FILE))
+ self.failUnlessEqual(self.furl, fileutil.read(INTRODUCER_FURL_FILE))
+ self.failUnlessEqual(self.portnum, fileutil.read(PORTNUM_FILE))
+ d.addCallback(_check_same_furl_and_port)
# now we can kill it. TODO: On a slow machine, the node might kill
- # itself before we get a chance too, especially if spawning the
+ # itself before we get a chance to, especially if spawning the
# 'tahoe stop' command takes a while.
def _stop(res):
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
self.failUnless(os.path.exists(TWISTD_PID_FILE))
return self.run_bintahoe(["--quiet", "stop", c1])
def _after_stopping(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
# the parent has exited by now
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
# gone by now.
self.failIf(os.path.exists(TWISTD_PID_FILE))
d.addCallback(_after_stopping)
-
- def _remove_hotline(res):
- os.unlink(HOTLINE_FILE)
- return res
- d.addBoth(_remove_hotline)
+ d.addBoth(self._remove, HOTLINE_FILE)
return d
test_introducer.timeout = 960
c1 = os.path.join(basedir, "c1")
HOTLINE_FILE = os.path.join(c1, "suicide_prevention_hotline")
TWISTD_PID_FILE = os.path.join(c1, "twistd.pid")
- PORTNUMFILE = os.path.join(c1, "client.port")
+ PORTNUM_FILE = os.path.join(c1, "client.port")
d = self.run_bintahoe(["--quiet", "create-client", "--basedir", c1, "--webport", "0"])
def _cb(res):
errstr = "cc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
assert rc_or_sig == 0, errstr
self.failUnlessEqual(rc_or_sig, 0)
- # By writing this file, we get forty seconds before the client will exit. This insures
+
+ # By writing this file, we get two minutes before the client will exit. This ensures
# that even if the 'stop' command doesn't work (and the test fails), the client should
# still terminate.
- open(HOTLINE_FILE, "w").write("")
- fileutil.write(os.path.join(basedir, "tahoe.cfg"), BASECONFIG_I % "pb://xrndsskn2zuuian5ltnxrte7lnuqdrkz@127.0.0.1:55617/introducer")
+ fileutil.write(HOTLINE_FILE, "")
# now it's safe to start the node
d.addCallback(_cb)
def _cb2(res):
out, err, rc_or_sig = res
errstr = "cc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr) # If you emit noise, you fail this test.
errlines = err.split("\n")
d.addCallback(_cb2)
def _node_has_started():
- return os.path.exists(PORTNUMFILE)
+ return os.path.exists(PORTNUM_FILE)
d.addCallback(lambda res: self.poll(_node_has_started))
# now we can kill it. TODO: On a slow machine, the node might kill
self.failUnless(os.path.exists(TWISTD_PID_FILE), (TWISTD_PID_FILE, os.listdir(os.path.dirname(TWISTD_PID_FILE))))
return self.run_bintahoe(["--quiet", "stop", c1])
d.addCallback(_stop)
+ d.addBoth(self._remove, HOTLINE_FILE)
return d
def test_client(self):
c1 = os.path.join(basedir, "c1")
HOTLINE_FILE = os.path.join(c1, "suicide_prevention_hotline")
TWISTD_PID_FILE = os.path.join(c1, "twistd.pid")
- PORTNUMFILE = os.path.join(c1, "client.port")
+ PORTNUM_FILE = os.path.join(c1, "client.port")
+ NODE_URL_FILE = os.path.join(c1, "node.url")
+ CONFIG_FILE = os.path.join(c1, "tahoe.cfg")
d = self.run_bintahoe(["--quiet", "create-node", "--basedir", c1, "--webport", "0"])
def _cb(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0)
- # By writing this file, we get sixty seconds before the client will exit. This insures
+
+ # Check that the --webport option worked.
+ config = fileutil.read(CONFIG_FILE)
+ self.failUnlessIn('\nweb.port = 0\n', config)
+
+ # By writing this file, we get two minutes before the client will exit. This ensures
# that even if the 'stop' command doesn't work (and the test fails), the client should
# still terminate.
- open(HOTLINE_FILE, "w").write("")
- fileutil.write(os.path.join(c1, "tahoe.cfg"), BASECONFIG_I % "pb://xrndsskn2zuuian5ltnxrte7lnuqdrkz@127.0.0.1:55617/introducer")
+ fileutil.write(HOTLINE_FILE, "")
# now it's safe to start the node
d.addCallback(_cb)
def _cb2(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr)
d.addCallback(_cb2)
def _node_has_started():
- return os.path.exists(PORTNUMFILE)
+ return os.path.exists(NODE_URL_FILE) and os.path.exists(PORTNUM_FILE)
d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res):
- open(HOTLINE_FILE, "w").write("")
+ # read the client.port file so we can check that its contents
+ # don't change on restart
+ self.portnum = fileutil.read(PORTNUM_FILE)
+
+ fileutil.write(HOTLINE_FILE, "")
self.failUnless(os.path.exists(TWISTD_PID_FILE))
- # rm this so we can detect when the second incarnation is ready
- os.unlink(PORTNUMFILE)
+ # rm this so we can detect when the second incarnation is ready
+ os.unlink(NODE_URL_FILE)
return self.run_bintahoe(["--quiet", "restart", c1])
d.addCallback(_started)
def _cb3(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr)
# so poll until it is
d.addCallback(lambda res: self.poll(_node_has_started))
+ def _check_same_port(res):
+ self.failUnlessEqual(self.portnum, fileutil.read(PORTNUM_FILE))
+ d.addCallback(_check_same_port)
+
# now we can kill it. TODO: On a slow machine, the node might kill
- # itself before we get a chance too, especially if spawning the
+ # itself before we get a chance to, especially if spawning the
# 'tahoe stop' command takes a while.
def _stop(res):
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
self.failUnless(os.path.exists(TWISTD_PID_FILE), (TWISTD_PID_FILE, os.listdir(os.path.dirname(TWISTD_PID_FILE))))
return self.run_bintahoe(["--quiet", "stop", c1])
d.addCallback(_stop)
def _cb4(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(HOTLINE_FILE, "")
# the parent has exited by now
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
# gone by now.
self.failIf(os.path.exists(TWISTD_PID_FILE))
d.addCallback(_cb4)
- def _remove_hotline(res):
- os.unlink(HOTLINE_FILE)
- return res
- d.addBoth(_remove_hotline)
+ d.addBoth(self._remove, HOTLINE_FILE)
return d
+ def _remove(self, res, file):
+ fileutil.remove(file)
+ return res
+
def test_baddir(self):
self.skip_if_cannot_daemonize()
basedir = self.workdir("test_baddir")
projects / tahoe-lafs / tahoe-lafs.git / blobdiff