+import os.path, re, sys, subprocess
+from cStringIO import StringIO
+
from twisted.trial import unittest
from twisted.python import usage, runtime
from twisted.internet import threads
-import os.path, re, sys, subprocess
-from cStringIO import StringIO
from allmydata.util import fileutil, pollmixin
from allmydata.util.encodingutil import unicode_to_argv, unicode_to_output, get_filesystem_encoding
from allmydata.scripts import runner
-
+from allmydata.client import Client
from allmydata.test import common_util
import allmydata
+
timeout = 240
def get_root_from_file(src):
if os.path.basename(root_from_cwd) == 'src':
root_from_cwd = os.path.dirname(root_from_cwd)
+ # This is needed if we are running in a temporary directory created by 'make tmpfstest'.
+ if os.path.basename(root_from_cwd).startswith('tmp'):
+ root_from_cwd = os.path.dirname(root_from_cwd)
+
same = (root_from_cwd == root_to_check)
if not same:
try:
if os.path.basename(root_from_cwdu) == u'src':
root_from_cwdu = os.path.dirname(root_from_cwdu)
+ # This is needed if we are running in a temporary directory created by 'make tmpfstest'.
+ if os.path.basename(root_from_cwdu).startswith(u'tmp'):
+ root_from_cwdu = os.path.dirname(root_from_cwdu)
+
if not isinstance(root_from_cwd, unicode) and root_from_cwd.decode(get_filesystem_encoding(), 'replace') != root_from_cwdu:
msg += ("However, this may be a false alarm because the current directory path\n"
"is not representable in the filesystem encoding. Please run the tests\n"
self._check_right_code(lines[1])
d.addCallback(_cb)
return d
+ # The timeout was exceeded on FreeStorm's CentOS5-i386.
+ test_import_in_repl.timeout = 480
def test_path(self):
d = self.run_bintahoe(["--version-and-path"])
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0, str(res))
- # Fail unless the allmydata-tahoe package is *this* version *and*
+ # Fail unless the __appname__ package is *this* version *and*
# was loaded from *this* source directory.
required_verstr = str(allmydata.__version__)
self.failIfEqual(required_verstr, "unknown",
"We don't know our version, because this distribution didn't come "
- "with a _version.py and 'setup.py darcsver' hasn't been run.")
+ "with a _version.py and 'setup.py update_version' hasn't been run.")
srcdir = os.path.dirname(os.path.dirname(os.path.normcase(os.path.realpath(srcfile))))
- info = (res, allmydata.__appname__, required_verstr, srcdir)
+ info = repr((res, allmydata.__appname__, required_verstr, srcdir))
appverpath = out.split(')')[0]
- (appver, path) = appverpath.split(' (')
+ (appverfull, path) = appverpath.split('] (')
+ (appver, comment) = appverfull.split(' [')
+ (branch, full_version) = comment.split(': ')
(app, ver) = appver.split(': ')
self.failUnlessEqual(app, allmydata.__appname__, info)
- self.failUnlessEqual(normalized_version(ver), normalized_version(required_verstr), info)
+ norm_ver = normalized_version(ver)
+ norm_required = normalized_version(required_verstr)
+ self.failUnlessEqual(norm_ver, norm_required, info)
self.failUnlessEqual(path, srcdir, info)
+ self.failUnlessEqual(branch, allmydata.branch)
+ self.failUnlessEqual(full_version, allmydata.full_version)
d.addCallback(_cb)
return d
def test_version_no_noise(self):
self.skip_if_cannot_run_bintahoe()
- from allmydata import get_package_versions, normalized_version
- twisted_ver = get_package_versions()['Twisted']
-
- if not normalized_version(twisted_ver) >= normalized_version('9.0.0'):
- raise unittest.SkipTest("We pass this test only with Twisted >= v9.0.0")
-
d = self.run_bintahoe(["--version"])
def _cb(res):
out, err, rc_or_sig = res
# '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)))
# test the --node-directory form
n3 = os.path.join(basedir, command + "-n3")
- argv = ["--quiet", command, "--node-directory", n3]
+ argv = ["--quiet", "--node-directory", n3, command]
rc, out, err = self.run_tahoe(argv)
self.failUnlessEqual(err, "")
self.failUnlessEqual(out, "")
self.failUnless(os.path.exists(n3))
self.failUnless(os.path.exists(os.path.join(n3, tac)))
+ if kind in ("client", "node", "introducer"):
+ # test that the output (without --quiet) includes the base directory
+ n4 = os.path.join(basedir, command + "-n4")
+ argv = [command, n4]
+ rc, out, err = self.run_tahoe(argv)
+ self.failUnlessEqual(err, "")
+ self.failUnlessIn(" created in ", out)
+ self.failUnlessIn(n4, out)
+ self.failIfIn("\\\\?\\", out)
+ self.failUnlessEqual(rc, 0)
+ self.failUnless(os.path.exists(n4))
+ self.failUnless(os.path.exists(os.path.join(n4, tac)))
+
# make sure it rejects too many arguments
argv = [command, "basedir", "extraarg"]
self.failUnlessRaises(usage.UsageError,
def test_introducer(self):
self.skip_if_cannot_daemonize()
+
basedir = self.workdir("test_introducer")
c1 = os.path.join(basedir, "c1")
- 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")
+ exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
+ twistd_pid_file = os.path.join(c1, "twistd.pid")
+ introducer_furl_file = os.path.join(c1, "private", "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(exit_trigger_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(exit_trigger_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(INTRODUCER_FURL_FILE)
+ return os.path.exists(introducer_furl_file)
d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res):
- open(HOTLINE_FILE, "w").write("")
- self.failUnless(os.path.exists(TWISTD_PID_FILE))
+ # 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(exit_trigger_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(exit_trigger_file, "")
errstr = "rc=%d, OUT: '%s', ERR: '%s'" % (rc_or_sig, out, err)
self.failUnlessEqual(rc_or_sig, 0, errstr)
self.failUnlessEqual(out, "", errstr)
# self.failUnlessEqual(err, "", errstr) # See test_client_no_noise -- for now we ignore noise.
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))
+ # Again, the second incarnation of the node might not be ready yet,
+ # 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))
- # 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
+ 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 to, especially if spawning the
# 'tahoe stop' command takes a while.
def _stop(res):
- open(HOTLINE_FILE, "w").write("")
- self.failUnless(os.path.exists(TWISTD_PID_FILE))
+ fileutil.write(exit_trigger_file, "")
+ self.failUnless(os.path.exists(twistd_pid_file))
return self.run_bintahoe(["--quiet", "stop", c1])
d.addCallback(_stop)
def _after_stopping(res):
out, err, rc_or_sig = res
- open(HOTLINE_FILE, "w").write("")
+ fileutil.write(exit_trigger_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)
# the parent was supposed to poll and wait until it sees
# twistd.pid go away before it exits, so twistd.pid should be
# gone by now.
- self.failIf(os.path.exists(TWISTD_PID_FILE))
+ 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, exit_trigger_file)
return d
+ # This test has hit a 240-second timeout on our feisty2.5 buildslave, and a 480-second timeout
+ # on Francois's Lenny-armv5tel buildslave.
test_introducer.timeout = 960
- # This test hit the 120-second timeout on "Francois Lenny-armv5tel", then it hit a 240-second timeout on our feisty2.5 buildslave: http://allmydata.org/buildbot/builders/feisty2.5/builds/2381/steps/test/logs/test.log
- # Then it hit the 480 second timeout on Francois's machine: http://tahoe-lafs.org/buildbot/builders/FranXois%20lenny-armv5tel/builds/449/steps/test/logs/stdio
-
def test_client_no_noise(self):
self.skip_if_cannot_daemonize()
- from allmydata import get_package_versions, normalized_version
- twisted_ver = get_package_versions()['Twisted']
-
- if not normalized_version(twisted_ver) >= normalized_version('9.0.0'):
- raise unittest.SkipTest("We pass this test only with Twisted >= v9.0.0")
-
basedir = self.workdir("test_client_no_noise")
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")
+ exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
+ twistd_pid_file = os.path.join(c1, "twistd.pid")
+ 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("")
- open(os.path.join(c1, "introducer.furl"), "w").write("pb://xrndsskn2zuuian5ltnxrte7lnuqdrkz@127.0.0.1:55617/introducer\n")
+ fileutil.write(exit_trigger_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(exit_trigger_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
# itself before we get a chance to, especially if spawning the
# 'tahoe stop' command takes a while.
def _stop(res):
- self.failUnless(os.path.exists(TWISTD_PID_FILE), (TWISTD_PID_FILE, os.listdir(os.path.dirname(TWISTD_PID_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)
+ d.addBoth(self._remove, exit_trigger_file)
return d
def test_client(self):
self.skip_if_cannot_daemonize()
+
basedir = self.workdir("test_client")
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")
+ exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
+ twistd_pid_file = os.path.join(c1, "twistd.pid")
+ 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("")
- open(os.path.join(c1, "introducer.furl"), "w").write("pb://xrndsskn2zuuian5ltnxrte7lnuqdrkz@127.0.0.1:55617/introducer\n")
+ fileutil.write(exit_trigger_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(exit_trigger_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)
+ # this depends upon both files being created atomically
+ 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("")
- self.failUnless(os.path.exists(TWISTD_PID_FILE))
- # rm this so we can detect when the second incarnation is ready
- os.unlink(PORTNUMFILE)
+ # 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(exit_trigger_file, "")
+ self.failUnless(os.path.exists(twistd_pid_file))
+
+ # 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(exit_trigger_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("")
- self.failUnless(os.path.exists(TWISTD_PID_FILE), (TWISTD_PID_FILE, os.listdir(os.path.dirname(TWISTD_PID_FILE))))
+ fileutil.write(exit_trigger_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(exit_trigger_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)
# the parent was supposed to poll and wait until it sees
# twistd.pid go away before it exits, so twistd.pid should be
# gone by now.
- self.failIf(os.path.exists(TWISTD_PID_FILE))
+ 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, exit_trigger_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")
def _cb(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 1)
- self.failUnless("does not look like a node directory" in err, err)
+ self.failUnless("is not a recognizable node directory" in err, err)
d.addCallback(_cb)
def _then_stop_it(res):
def _cb3(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 1)
- self.failUnless("does not look like a directory at all" in err, err)
+ self.failUnlessIn("does not look like a directory at all", err)
d.addCallback(_cb3)
return d
def test_keygen(self):
self.skip_if_cannot_daemonize()
+
basedir = self.workdir("test_keygen")
c1 = os.path.join(basedir, "c1")
- TWISTD_PID_FILE = os.path.join(c1, "twistd.pid")
- KEYGEN_FURL_FILE = os.path.join(c1, "key_generator.furl")
+ twistd_pid_file = os.path.join(c1, "twistd.pid")
+ keygen_furl_file = os.path.join(c1, "key_generator.furl")
d = self.run_bintahoe(["--quiet", "create-key-generator", "--basedir", c1])
def _cb(res):
d.addCallback(_cb2)
def _node_has_started():
- return os.path.exists(KEYGEN_FURL_FILE)
+ return os.path.exists(keygen_furl_file)
d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res):
- self.failUnless(os.path.exists(TWISTD_PID_FILE))
+ self.failUnless(os.path.exists(twistd_pid_file))
# rm this so we can detect when the second incarnation is ready
- os.unlink(KEYGEN_FURL_FILE)
+ os.unlink(keygen_furl_file)
return self.run_bintahoe(["--quiet", "restart", c1])
d.addCallback(_started)
# itself before we get a chance too, especially if spawning the
# 'tahoe stop' command takes a while.
def _stop(res):
- self.failUnless(os.path.exists(TWISTD_PID_FILE))
+ self.failUnless(os.path.exists(twistd_pid_file))
return self.run_bintahoe(["--quiet", "stop", c1])
d.addCallback(_stop)
# the parent was supposed to poll and wait until it sees
# twistd.pid go away before it exits, so twistd.pid should be
# gone by now.
- self.failIf(os.path.exists(TWISTD_PID_FILE))
+ self.failIf(os.path.exists(twistd_pid_file))
d.addCallback(_cb4)
return d
projects / tahoe-lafs / tahoe-lafs.git / blobdiff