a few formatting tidy-ups

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index 8c17e8aadf13afa70a2dc632a9aedfd34c4654ec..4824d26869141796a3fbeea3f9dcad9c9678b8c4 100644 (file)
--- 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 7680b649cc2520764561830434b6f1951c802786..015b81cd315958663fd3e7fd36c7f02da4aad274 100644 (file)
--- 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 b7ef7499d4ccd6b419110fad9c2e48ffb1b66fff..e5faf4eedee6d87a6f8c31b3e7ae9731d2518ded 100644 (file)
--- 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)