109: Cleanups in cmd; added unit tests for cmd.validate()

1 files changed, 19 insertions, 1 deletions

diff --git a/ipalib/tests/test_public.py b/ipalib/tests/test_public.py
index 4f3d382f..81401859 100644
--- a/ipalib/tests/test_public.py
+++ b/ipalib/tests/test_public.py
@@ -170,7 +170,7 @@ class test_cmd(ClassChecker):
             @public.rule
             def my_rule(self, value):
                 if value != self.name:
-                    return 'must equal %s' % name
+                    return 'must equal %r' % self.name
             def default(self, **kw):
                 return kw['default_from']
 
@@ -249,6 +249,24 @@ class test_cmd(ClassChecker):
         assert sub.default(**no_fill) == {}
         assert sub.default(**fill) == default
 
+    def test_validate(self):
+        """
+        Tests the `validate` method.
+        """
+        assert 'validate' in self.cls.__public__ # Public
+        sub = self.subcls()
+        for name in ('option0', 'option1'):
+            okay = {
+                name: name,
+                'another_option': 'some value',
+            }
+            fail = {
+                name: 'whatever',
+                'another_option': 'some value',
+            }
+            sub.validate(**okay)
+            raises(errors.RuleError, sub.validate, **fail)
+
 
 def test_obj():
     cls = public.obj