Merge pull request tahoe-lafs#1382 from jwjacobson/1101.feature

1101.feature Add verbose flag to check command

Author: meejah

.pre-commit-config.yaml

@@ -3,8 +3,8 @@ repos:
     hooks:
     - id: "codechecks"
       name: "codechecks"
-      stages: ["push"]
+      stages: ["pre-push"]
       language: "system"
       files: ".py$"
       entry: "tox -e codechecks"
-      pass_filenames: true
+      pass_filenames: false

newsfragments/1101.feature

@@ -0,0 +1 @@
+Adding support for --verbose option

src/allmydata/scripts/cli.py

@@ -445,6 +445,7 @@ class CheckOptions(FileStoreOptions):
         ("verify", None, "Verify all hashes, instead of merely querying share presence."),
         ("repair", None, "Automatically repair any problems found."),
         ("add-lease", None, "Add/renew lease on all shares."),
+        ("verbose", None, "Provide verbose output (unimplemented)."),
         ]
     def parseArgs(self, *locations):
         self.locations = list(map(argv_to_unicode, locations))

src/allmydata/test/cli/test_check.py

@@ -151,6 +151,18 @@ def _check5(args):
             self.failIf(" corrupt shares:" in lines, out)
         d.addCallback(_check5)
 
+        # Testing verbose option
+        d.addCallback(lambda ign: self.do_cli("check", "--verbose", self.uri))
+        def _check6(args):
+            (rc, out, err) = args
+            self.assertEqual(len(err), 0, err)
+            self.failUnlessReallyEqual(rc, 0)
+            lines = out.splitlines()
+            self.failUnless("Summary: Healthy" in lines, out)
+            self.failUnless(" good-shares: 10 (encoding is 3-of-10)" in lines, out)
+        d.addCallback(_check1)
+
+
         return d
 
     def test_deep_check(self):