mirror of
https://github.com/tahoe-lafs/tahoe-lafs.git
synced 2025-01-31 16:36:20 +00:00
move my_private_dir.cap into private/
This commit is contained in:
parent
a592551ccf
commit
b8d77fbb46
@ -120,7 +120,11 @@ class Client(node.Node, Referenceable, testutil.PollMixin):
|
|||||||
read-write mutable directory URI, then I create a new mutable
|
read-write mutable directory URI, then I create a new mutable
|
||||||
directory and write its URI into that file.
|
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):
|
if os.path.exists(privdirfile):
|
||||||
try:
|
try:
|
||||||
theuri = open(privdirfile, "r").read().strip()
|
theuri = open(privdirfile, "r").read().strip()
|
||||||
|
@ -70,7 +70,8 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
|
|||||||
if i == 0:
|
if i == 0:
|
||||||
open(os.path.join(basedir, "webport"), "w").write("tcp:0:interface=127.0.0.1")
|
open(os.path.join(basedir, "webport"), "w").write("tcp:0:interface=127.0.0.1")
|
||||||
if self.createprivdir:
|
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)
|
open(os.path.join(basedir, "introducer.furl"), "w").write(self.introducer_furl)
|
||||||
c = self.add_service(client.Client(basedir=basedir))
|
c = self.add_service(client.Client(basedir=basedir))
|
||||||
self.clients.append(c)
|
self.clients.append(c)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user