ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-04 12:14:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

test_runner: fix to use new conventions

Browse Source 
create-node needs --hostname=, and we can't expect the node to write
client.port at startup (because tahoe.cfg now has tub.port= set
properly)
This commit is contained in:
Brian Warner 2016-09-09 18:49:37 -07:00
parent 38ebdfac20
commit 229e306e9d
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/allmydata/test/test_runner.py
View File

@ -262,14 +262,14 @@ class CreateNode(unittest.TestCase):
command) command)
def test_node(self): def test_node(self):
self.do_create("node") self.do_create("node", "--hostname=127.0.0.1")
def test_client(self): def test_client(self):
# create-client should behave like create-node --no-storage. # create-client should behave like create-node --no-storage.
self.do_create("client") self.do_create("client")
def test_introducer(self): def test_introducer(self):
self.do_create("introducer") self.do_create("introducer", "--hostname=127.0.0.1")
def test_stats_gatherer(self): def test_stats_gatherer(self):
self.do_create("stats-gatherer", "--hostname=127.0.0.1") self.do_create("stats-gatherer", "--hostname=127.0.0.1")
@ -340,7 +340,6 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE) exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
twistd_pid_file = os.path.join(c1, "twistd.pid") twistd_pid_file = os.path.join(c1, "twistd.pid")
introducer_furl_file = os.path.join(c1, "private", "introducer.furl") 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") node_url_file = os.path.join(c1, "node.url")
config_file = os.path.join(c1, "tahoe.cfg") config_file = os.path.join(c1, "tahoe.cfg")
@ -390,11 +389,9 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
d.addCallback(lambda res: self.poll(_node_has_started)) d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res): def _started(res):
# read the introducer.furl and introducer.port files so we can # read the introducer.furl file so we can check that the contents
# check that their contents don't change on restart # don't change on restart
self.furl = fileutil.read(introducer_furl_file) 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, "") fileutil.write(exit_trigger_file, "")
self.failUnless(os.path.exists(twistd_pid_file)) self.failUnless(os.path.exists(twistd_pid_file))
@ -418,14 +415,13 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
# so poll until it is. This time introducer_furl_file already # so poll until it is. This time introducer_furl_file already
# exists, so we check for the existence of node_url_file instead. # exists, so we check for the existence of node_url_file instead.
def _node_has_restarted(): def _node_has_restarted():
return os.path.exists(node_url_file) and os.path.exists(portnum_file) return os.path.exists(node_url_file)
d.addCallback(lambda res: self.poll(_node_has_restarted)) d.addCallback(lambda res: self.poll(_node_has_restarted))
def _check_same_furl_and_port(res): def _check_same_furl(res):
self.failUnless(os.path.exists(introducer_furl_file)) self.failUnless(os.path.exists(introducer_furl_file))
self.failUnlessEqual(self.furl, fileutil.read(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)
d.addCallback(_check_same_furl_and_port)
# Now we can kill it. TODO: On a slow machine, the node might kill # 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 # itself before we get a chance to, especially if spawning the
@ -463,7 +459,7 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
c1 = os.path.join(basedir, "c1") c1 = os.path.join(basedir, "c1")
exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE) exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
twistd_pid_file = os.path.join(c1, "twistd.pid") 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")
d = self.run_bintahoe(["--quiet", "create-client", "--basedir", c1, "--webport", "0"]) d = self.run_bintahoe(["--quiet", "create-client", "--basedir", c1, "--webport", "0"])
def _cb(res): def _cb(res):
@ -506,7 +502,7 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
d.addCallback(_cb2) d.addCallback(_cb2)
def _node_has_started(): def _node_has_started():
return os.path.exists(portnum_file) return os.path.exists(node_url_file)
d.addCallback(lambda res: self.poll(_node_has_started)) d.addCallback(lambda res: self.poll(_node_has_started))
# now we can kill it. TODO: On a slow machine, the node might kill # now we can kill it. TODO: On a slow machine, the node might kill
@ -527,11 +523,13 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
c1 = os.path.join(basedir, "c1") c1 = os.path.join(basedir, "c1")
exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE) exit_trigger_file = os.path.join(c1, Client.EXIT_TRIGGER_FILE)
twistd_pid_file = os.path.join(c1, "twistd.pid") 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") node_url_file = os.path.join(c1, "node.url")
storage_furl_file = os.path.join(c1, "private", "storage.furl")
config_file = os.path.join(c1, "tahoe.cfg") config_file = os.path.join(c1, "tahoe.cfg")
d = self.run_bintahoe(["--quiet", "create-node", "--basedir", c1, "--webport", "0", "--hostname", "localhost"]) d = self.run_bintahoe(["--quiet", "create-node", "--basedir", c1,
"--webport", "0",
"--hostname", "localhost"])
def _cb(res): def _cb(res):
out, err, rc_or_sig = res out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 0) self.failUnlessEqual(rc_or_sig, 0)
@ -540,9 +538,9 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
config = fileutil.read(config_file) config = fileutil.read(config_file)
self.failUnlessIn('\nweb.port = 0\n', config) self.failUnlessIn('\nweb.port = 0\n', config)
# By writing this file, we get two minutes before the client will exit. This ensures # By writing this file, we get two minutes before the client will
# that even if the 'stop' command doesn't work (and the test fails), the client should # exit. This ensures that even if the 'stop' command doesn't work
# still terminate. # (and the test fails), the client should still terminate.
fileutil.write(exit_trigger_file, "") fileutil.write(exit_trigger_file, "")
# now it's safe to start the node # now it's safe to start the node
d.addCallback(_cb) d.addCallback(_cb)
@ -570,14 +568,13 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
d.addCallback(_cb2) d.addCallback(_cb2)
def _node_has_started(): def _node_has_started():
# this depends upon both files being created atomically return os.path.exists(node_url_file)
return os.path.exists(node_url_file) and os.path.exists(portnum_file)
d.addCallback(lambda res: self.poll(_node_has_started)) d.addCallback(lambda res: self.poll(_node_has_started))
def _started(res): def _started(res):
# read the client.port file so we can check that its contents # read the storage.furl file so we can check that its contents
# don't change on restart # don't change on restart
self.portnum = fileutil.read(portnum_file) self.storage_furl = fileutil.read(storage_furl_file)
fileutil.write(exit_trigger_file, "") fileutil.write(exit_trigger_file, "")
self.failUnless(os.path.exists(twistd_pid_file)) self.failUnless(os.path.exists(twistd_pid_file))
@ -601,9 +598,10 @@ class RunNode(common_util.SignalMixin, unittest.TestCase, pollmixin.PollMixin,
# so poll until it is # so poll until it is
d.addCallback(lambda res: self.poll(_node_has_started)) d.addCallback(lambda res: self.poll(_node_has_started))
def _check_same_port(res): def _check_same_furl(res):
self.failUnlessEqual(self.portnum, fileutil.read(portnum_file)) self.failUnlessEqual(self.storage_furl,
d.addCallback(_check_same_port) fileutil.read(storage_furl_file))
d.addCallback(_check_same_furl)
# now we can kill it. TODO: On a slow machine, the node might kill # 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 # itself before we get a chance to, especially if spawning the