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

setup: fix test_runner.RunNode.test_baddir -- it was left incomplete and broken by a recent patch

Browse Source
This commit is contained in:
Zooko O'Whielacronx 2009-01-27 14:32:45 -07:00
parent 70576a871b
commit 3cd4722c9b
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -431,22 +431,27 @@ class RunNode(unittest.TestCase, pollmixin.PollMixin, common_util.SignalMixin):
self.failUnless("does not look like a node directory" in err)
d.addCallback(_cb)
d.addCallback
def _then_stop_it(res):
return utils.getProcessOutputAndValue(bintahoe, args=["--quiet", "stop", "--basedir", basedir], env=os.environ)
d.addCallback(_then_stop_it)
argv = ["--quiet", "stop", "--basedir", basedir]
out,err = StringIO(), StringIO()
rc = runner.runner(argv, stdout=out, stderr=err)
self.failUnlessEqual(rc, 2)
self.failUnless("does not look like a running node directory"
in err.getvalue())
def _cb2(res):
out, err, rc_or_sig = res
self.failUnlessEqual(rc_or_sig, 2)
self.failUnless("does not look like a running node directory" in err)
d.addCallback(_cb2)
def _then_start_in_bogus_basedir(res):
not_a_dir = os.path.join(basedir, "bogus")
argv = ["--quiet", "start", "--basedir", not_a_dir]
out,err = StringIO(), StringIO()
rc = runner.runner(argv, stdout=out, stderr=err)
self.failUnlessEqual(rc, 1)
self.failUnless("does not look like a directory at all"
in err.getvalue(), err.getvalue())
return utils.getProcessOutputAndValue(bintahoe, args=["--quiet", "start", "--basedir", not_a_dir], env=os.environ)
d.addCallback(_then_start_in_bogus_basedir)
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)
d.addCallback(_cb3)
return d
def test_keygen(self):
if not os.path.exists(bintahoe):