Index: chrome/test/mini_installer/verifier.py |
diff --git a/chrome/test/mini_installer/verifier.py b/chrome/test/mini_installer/verifier.py |
index 7b0fae6c46e0dc6dc16d204d4902e3edaa1cf2bd..8d3e7a47664595aed543a8a3da628cddc929510b 100644 |
--- a/chrome/test/mini_installer/verifier.py |
+++ b/chrome/test/mini_installer/verifier.py |
@@ -4,12 +4,16 @@ |
import registry_verifier |
-def Verify(property): |
- """Verifies that the current machine states match the property object.""" |
+def Verify(property, testcase): |
gab
2013/08/07 13:03:34
Instead of having this method take a testcase (and
sukolsak
2013/08/07 21:23:29
I like to think of verifiers as a collection of st
gab
2013/08/08 02:09:29
And yes, I agree, that's also how I saw them at fi
|
+ """Verifies that the current machine states match the property object. |
+ |
+ Args: |
+ property: A property dictionary. |
+ testcase: A TestCase instance. |
+ """ |
for verifier_name, value in property.iteritems(): |
if verifier_name == 'RegistryEntries': |
- registry_verifier.VerifyRegistryEntries(value) |
+ registry_verifier.VerifyRegistryEntries(value, testcase) |
else: |
# TODO(sukolsak): Implement other verifiers |
- # TODO(sukolsak): Use unittest framework instead of exceptions. |
- raise Exception('Unknown verifier') |
+ testcase.fail('Unknown verifier %s' % verifier_name) |