diff options
Diffstat (limited to 'ipatests/test_ipalib/test_parameters.py')
| -rw-r--r-- | ipatests/test_ipalib/test_parameters.py | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/ipatests/test_ipalib/test_parameters.py b/ipatests/test_ipalib/test_parameters.py index 0968a11d5..999dd19f0 100644 --- a/ipatests/test_ipalib/test_parameters.py +++ b/ipatests/test_ipalib/test_parameters.py @@ -459,38 +459,32 @@ class test_Param(ClassChecker): # Test in default state (with no rules, no kwarg): o = self.cls('my_param') - e = raises(errors.RequirementError, o.validate, None, 'cli') + e = raises(errors.RequirementError, o.validate, None) assert e.name == 'my_param' - # Test in default state that cli_name gets returned in the exception - # when context == 'cli' - o = self.cls('my_param', cli_name='short') - e = raises(errors.RequirementError, o.validate, None, 'cli') - assert e.name == 'short' - # Test with required=False o = self.cls('my_param', required=False) assert o.required is False - assert o.validate(None, 'cli') is None + assert o.validate(None) is None # Test with query=True: o = self.cls('my_param', query=True) assert o.query is True - e = raises(errors.RequirementError, o.validate, None, 'cli') + e = raises(errors.RequirementError, o.validate, None) assert_equal(e.name, 'my_param') # Test with multivalue=True: o = self.cls('my_param', multivalue=True) - e = raises(TypeError, o.validate, [], 'cli') + e = raises(TypeError, o.validate, []) assert str(e) == TYPE_ERROR % ('value', tuple, [], list) - e = raises(ValueError, o.validate, tuple(), 'cli') + e = raises(ValueError, o.validate, tuple()) assert str(e) == 'value: empty tuple must be converted to None' # Test with wrong (scalar) type: - e = raises(TypeError, o.validate, (None, None, 42, None), 'cli') + e = raises(TypeError, o.validate, (None, None, 42, None)) assert str(e) == TYPE_ERROR % ('my_param', type(None), 42, int) o = self.cls('my_param') - e = raises(TypeError, o.validate, 'Hello', 'cli') + e = raises(TypeError, o.validate, 'Hello') assert str(e) == TYPE_ERROR % ('my_param', type(None), 'Hello', str) class Example(self.cls): @@ -502,13 +496,13 @@ class test_Param(ClassChecker): fail = DummyRule(u'no good') o = Example('example', pass1, pass2) assert o.multivalue is False - assert o.validate(11, 'cli') is None + assert o.validate(11) is None assert pass1.calls == [(text.ugettext, 11)] assert pass2.calls == [(text.ugettext, 11)] pass1.reset() pass2.reset() o = Example('example', pass1, pass2, fail) - e = raises(errors.ValidationError, o.validate, 42, 'cli') + e = raises(errors.ValidationError, o.validate, 42) assert e.name == 'example' assert e.error == u'no good' assert e.index is None @@ -522,7 +516,7 @@ class test_Param(ClassChecker): fail = DummyRule(u'this one is not good') o = Example('example', pass1, pass2, multivalue=True) assert o.multivalue is True - assert o.validate((3, 9), 'cli') is None + assert o.validate((3, 9)) is None assert pass1.calls == [ (text.ugettext, 3), (text.ugettext, 9), @@ -535,7 +529,7 @@ class test_Param(ClassChecker): pass2.reset() o = Example('multi_example', pass1, pass2, fail, multivalue=True) assert o.multivalue is True - e = raises(errors.ValidationError, o.validate, (3, 9), 'cli') + e = raises(errors.ValidationError, o.validate, (3, 9)) assert e.name == 'multi_example' assert e.error == u'this one is not good' assert e.index == 0 |