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.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)
+ self.failUnless(re.search(r"\n\[magic_folder\]\n#.*\n#enabled = false\n", content), content)
# creating the node a second time should be rejected
rc, out, err = self.run_tahoe(argv)
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 _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