a few formatting tidy-ups

This commit is contained in:
Zooko O'Whielacronx 2008-01-03 17:14:19 -07:00
parent acfb11d26f
commit 23961448da
3 changed files with 1 additions and 3 deletions

View File

@ -18,7 +18,7 @@ class VDriveOptions(BaseOptions, usage.Options):
"URL of the tahoe node to use, a URL like \"http://127.0.0.1:8123\". " "URL of the tahoe node to use, a URL like \"http://127.0.0.1:8123\". "
"This overrides the URL found in the --node-directory ."], "This overrides the URL found in the --node-directory ."],
["dir-uri", "r", "root", ["dir-uri", "r", "root",
"Which dirnode URI should be used as a root directory. The " "Which dirnode URI should be used as a root directory. The "
"string 'root' is special, and means we should use the " "string 'root' is special, and means we should use the "
"directory found in the 'root_dir.cap' file in the 'private' " "directory found in the 'root_dir.cap' file in the 'private' "
"subdirectory of the --node-directory ."], "subdirectory of the --node-directory ."],

View File

@ -16,7 +16,6 @@ class CLI(unittest.TestCase):
fileutil.rm_dir("cli/test_options") fileutil.rm_dir("cli/test_options")
fileutil.make_dirs("cli/test_options") fileutil.make_dirs("cli/test_options")
open("cli/test_options/node.url","w").write("http://localhost:8080/\n") open("cli/test_options/node.url","w").write("http://localhost:8080/\n")
#private_uri = uri.DirnodeURI("furl", "key").to_string()
filenode_uri = uri.WriteableSSKFileURI(writekey="\x00"*16, filenode_uri = uri.WriteableSSKFileURI(writekey="\x00"*16,
fingerprint="\x00"*32) fingerprint="\x00"*32)
private_uri = uri.NewDirectoryURI(filenode_uri).to_string() private_uri = uri.NewDirectoryURI(filenode_uri).to_string()

View File

@ -591,7 +591,6 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
c0 = self.clients[0] c0 = self.clients[0]
d = c0.create_empty_dirnode(wait_for_numpeers=self.numclients) d = c0.create_empty_dirnode(wait_for_numpeers=self.numclients)
def _made_root(new_dirnode): def _made_root(new_dirnode):
log.msg("ZZZ %s -> %s" % (hasattr(self, '_root_directory_uri') and self._root_directory_uri, new_dirnode.get_uri(),))
self._root_directory_uri = new_dirnode.get_uri() self._root_directory_uri = new_dirnode.get_uri()
return c0.create_node_from_uri(self._root_directory_uri) return c0.create_node_from_uri(self._root_directory_uri)
d.addCallback(_made_root) d.addCallback(_made_root)