# we're willing to use an empty directory
else:
os.mkdir(basedir)
- f = open(os.path.join(basedir, "client.tac"), "w")
+ f = open(os.path.join(basedir, "tahoe-client.tac"), "w")
f.write(client_tac)
f.close()
if config.get('webport', "none").lower() != "none":
# we're willing to use an empty directory
else:
os.mkdir(basedir)
- f = open(os.path.join(basedir, "introducer.tac"), "w")
+ f = open(os.path.join(basedir, "tahoe-introducer.tac"), "w")
f.write(introducer_tac)
f.close()
print >>out, "introducer created in %s" % basedir
if os.path.exists(os.path.join(basedir, "client.tac")):
tac = "client.tac"
type = "client"
+ elif os.path.exists(os.path.join(basedir, "tahoe-client.tac")):
+ tac = "tahoe-client.tac"
+ type = "client"
elif os.path.exists(os.path.join(basedir, "introducer.tac")):
tac = "introducer.tac"
type = "introducer"
+ elif os.path.exists(os.path.join(basedir, "tahoe-introducer.tac")):
+ tac = "tahoe-introducer.tac"
+ type = "introducer"
else:
print >>err, "%s does not look like a node directory" % basedir
if not os.path.isdir(basedir):
pp = ClientWatcher()
self.proc_done = pp.d = defer.Deferred()
logfile = os.path.join(self.basedir, "client.log")
- cmd = ["twistd", "-n", "-y", "client.tac", "-l", logfile]
+ cmd = ["twistd", "-n", "-y", "tahoe-client.tac", "-l", logfile]
env = os.environ.copy()
self.proc = reactor.spawnProcess(pp, cmd[0], cmd, env, path=clientdir)
log.msg("CLIENT STARTED")
self.failUnlessEqual(out.getvalue(), "")
self.failUnlessEqual(rc, 0)
self.failUnless(os.path.exists(c1))
- self.failUnless(os.path.exists(os.path.join(c1, "client.tac")))
+ self.failUnless(os.path.exists(os.path.join(c1, "tahoe-client.tac")))
# creating the client a second time should throw an exception
out,err = StringIO(), StringIO()
argv = ["--quiet", "create-client", c2]
runner.runner(argv)
self.failUnless(os.path.exists(c2))
- self.failUnless(os.path.exists(os.path.join(c2, "client.tac")))
+ self.failUnless(os.path.exists(os.path.join(c2, "tahoe-client.tac")))
self.failUnlessRaises(usage.UsageError,
runner.runner,
self.failUnlessEqual(out.getvalue(), "")
self.failUnlessEqual(rc, 0)
self.failUnless(os.path.exists(c1))
- self.failUnless(os.path.exists(os.path.join(c1, "introducer.tac")))
+ self.failUnless(os.path.exists(os.path.join(c1,
+ "tahoe-introducer.tac")))
# creating the introducer a second time should throw an exception
out,err = StringIO(), StringIO()
argv = ["--quiet", "create-introducer", c2]
runner.runner(argv)
self.failUnless(os.path.exists(c2))
- self.failUnless(os.path.exists(os.path.join(c2, "introducer.tac")))
+ self.failUnless(os.path.exists(os.path.join(c2,
+ "tahoe-introducer.tac")))
self.failUnlessRaises(usage.UsageError,
runner.runner,