Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1083)

Unified Diff: chrome/test/mini_installer/verifier.py

Issue 22480002: Use unittest framework in the Automated Installer Testing Framework. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Change verifiers to classes. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..558c7897f77826c7e2be77ef6c3ca68464b2122f 100644
--- a/chrome/test/mini_installer/verifier.py
+++ b/chrome/test/mini_installer/verifier.py
@@ -2,14 +2,30 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import registry_verifier
-
-def Verify(property):
- """Verifies that the current machine states match the property object."""
- for verifier_name, value in property.iteritems():
- if verifier_name == 'RegistryEntries':
- registry_verifier.VerifyRegistryEntries(value)
- else:
- # TODO(sukolsak): Implement other verifiers
- # TODO(sukolsak): Use unittest framework instead of exceptions.
- raise Exception('Unknown verifier')
+from registry_verifier import RegistryVerifier
+
+class Verifier:
+ """Verifies that the current machine state matches the expected machine
+ state."""
+
+ def __init__(self, testcase):
+ """Constructor.
+
+ Args:
+ testcase: A unittest.TestCase instance.
+ """
+ self.testcase = testcase
+ self.registry_verifier = RegistryVerifier(testcase)
gab 2013/08/08 02:07:08 How about a single dictionary of verifiers, e.g.:
robertshield 2013/08/09 19:00:15 I agree with the notion of having Verifiers derive
+
+ def Verify(self, property):
robertshield 2013/08/09 19:00:15 If the comment above is followed, this would then
sukolsak 2013/08/09 21:12:38 Done.
+ """Verifies that the current machine states match the property dictionary.
+
+ Args:
+ property: A property dictionary.
+ """
+ for verifier_name, value in property.iteritems():
+ if verifier_name == 'RegistryEntries':
+ self.registry_verifier.VerifyRegistryEntries(value)
+ else:
+ # TODO(sukolsak): Implement other verifiers
+ self.testcase.fail('Unknown verifier %s' % verifier_name)
« chrome/test/mini_installer/test_installer.py ('K') | « chrome/test/mini_installer/test_installer.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698