checker: improve test coverage a little bit

This commit is contained in:
Brian Warner 2007-12-04 18:00:12 -07:00
parent bf1b7d78e2
commit 4b8c2e93b3
2 changed files with 7 additions and 2 deletions

View File

@ -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:

View File

@ -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