From: Brian Warner <warner@allmydata.com>
Date: Wed, 5 Dec 2007 01:00:12 +0000 (-0700)
Subject: checker: improve test coverage a little bit
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=4b8c2e93b3e5d07ccfc895e6de1f8c7cd0539ef5;p=tahoe-lafs%2Ftahoe-lafs.git

checker: improve test coverage a little bit
---

diff --git a/src/allmydata/checker.py b/src/allmydata/checker.py
index fdb8d312..66874013 100644
--- a/src/allmydata/checker.py
+++ b/src/allmydata/checker.py
@@ -223,10 +223,10 @@ class Checker(service.MultiService):
         return d
 
     def verify(self, uri_to_verify):
-        uri_to_verify = IVerifierURI(uri_to_verify)
         if uri_to_verify is None:
             return defer.succeed(True)
-        elif isinstance(uri_to_verify, uri.CHKFileVerifierURI):
+        uri_to_verify = IVerifierURI(uri_to_verify)
+        if isinstance(uri_to_verify, uri.CHKFileVerifierURI):
             v = SimpleCHKFileVerifier(self.parent, uri_to_verify)
             return v.start()
         else:
diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 97119914..e72d8392 100644
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -1164,6 +1164,9 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
 
     def _test_checker_2(self, manifest):
         checker1 = self.clients[1].getServiceNamed("checker")
+        self.failUnlessEqual(checker1.checker_results_for(None), [])
+        self.failUnlessEqual(checker1.checker_results_for(list(manifest)[0]),
+                             [])
         dl = []
         starting_time = time.time()
         for si in manifest:
@@ -1245,4 +1248,6 @@ class SystemTest(testutil.SignalMixin, unittest.TestCase):
             for i in res:
                 self.failUnless(i is True)
         d.addCallback(_done)
+        d.addCallback(lambda res: checker1.verify(None))
+        d.addCallback(self.failUnlessEqual, True)
         return d