From 23961448dab2af95784d0cd8c3b5a5f6e14df825 Mon Sep 17 00:00:00 2001 From: Zooko O'Whielacronx Date: Thu, 3 Jan 2008 17:14:19 -0700 Subject: [PATCH] a few formatting tidy-ups --- src/allmydata/scripts/cli.py | 2 +- src/allmydata/test/test_cli.py | 1 - src/allmydata/test/test_system.py | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py index 8c17e8aa..4824d268 100644 --- a/src/allmydata/scripts/cli.py +++ b/src/allmydata/scripts/cli.py @@ -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\". " "This overrides the URL found in the --node-directory ."], ["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 " "directory found in the 'root_dir.cap' file in the 'private' " "subdirectory of the --node-directory ."], diff --git a/src/allmydata/test/test_cli.py b/src/allmydata/test/test_cli.py index 7680b649..015b81cd 100644 --- a/src/allmydata/test/test_cli.py +++ b/src/allmydata/test/test_cli.py @@ -16,7 +16,6 @@ class CLI(unittest.TestCase): fileutil.rm_dir("cli/test_options") fileutil.make_dirs("cli/test_options") 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, fingerprint="\x00"*32) private_uri = uri.NewDirectoryURI(filenode_uri).to_string() diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index b7ef7499..e5faf4ee 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -591,7 +591,6 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase): c0 = self.clients[0] d = c0.create_empty_dirnode(wait_for_numpeers=self.numclients) 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() return c0.create_node_from_uri(self._root_directory_uri) d.addCallback(_made_root) -- 2.45.2