move my_private_dir.cap into private/

This commit is contained in:
Brian Warner 2007-12-17 20:57:40 -07:00
parent a592551ccf
commit b8d77fbb46
2 changed files with 7 additions and 2 deletions

View File

@ -120,7 +120,11 @@ class Client(node.Node, Referenceable, testutil.PollMixin):
read-write mutable directory URI, then I create a new mutable
directory and write its URI into that file.
"""
privdirfile = os.path.join(self.basedir, self.MY_PRIVATE_DIR_FILE)
# TODO: change this to use Node.get_or_create_private_config(). That
# will probably require passing a validation function in, or
# something.
privdirfile = os.path.join(self.basedir, "private",
self.MY_PRIVATE_DIR_FILE)
if os.path.exists(privdirfile):
try:
theuri = open(privdirfile, "r").read().strip()

View File

@ -70,7 +70,8 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
if i == 0:
open(os.path.join(basedir, "webport"), "w").write("tcp:0:interface=127.0.0.1")
if self.createprivdir:
open(os.path.join(basedir, "my_private_dir.cap"), "w")
fileutil.make_dirs(os.path.join(basedir, "private"))
open(os.path.join(basedir, "private", "my_private_dir.cap"), "w")
open(os.path.join(basedir, "introducer.furl"), "w").write(self.introducer_furl)
c = self.add_service(client.Client(basedir=basedir))
self.clients.append(c)