diff options
| -rw-r--r-- | ipalib/parameter.py | 8 | ||||
| -rw-r--r-- | tests/test_ipalib/test_parameter.py | 14 |
2 files changed, 17 insertions, 5 deletions
diff --git a/ipalib/parameter.py b/ipalib/parameter.py index e4268825c..9653e1680 100644 --- a/ipalib/parameter.py +++ b/ipalib/parameter.py @@ -211,7 +211,7 @@ class Param(ReadOnly): (name, kw_from_spec) = parse_param_spec(name) kw.update(kw_from_spec) self.name = check_name(name) - self.nice = '%s(%r)' % (self.__class__.__name__, self.name) + self.nice = '%s(%r)' % (self.__class__.__name__, self.param_spec) # Add 'default' to self.kwargs and makes sure no unknown kw were given: assert type(self.type) is type @@ -269,8 +269,10 @@ class Param(ReadOnly): check_name(self.cli_name) # Check that all the rules are callable - self.rules = tuple(class_rules) + rules - for rule in self.rules: + self.class_rules = tuple(class_rules) + self.rules = rules + self.all_rules = self.class_rules + self.rules + for rule in self.all_rules: if not callable(rule): raise TypeError( '%s: rules must be callable; got %r' % (self.nice, rule) diff --git a/tests/test_ipalib/test_parameter.py b/tests/test_ipalib/test_parameter.py index 23b81f283..508e399f3 100644 --- a/tests/test_ipalib/test_parameter.py +++ b/tests/test_ipalib/test_parameter.py @@ -108,11 +108,15 @@ class test_Param(ClassChecker): """ name = 'my_param' o = self.cls(name) + assert o.param_spec is name assert o.name is name + assert o.nice == "Param('my_param')" assert o.__islocked__() is True # Test default rules: assert o.rules == tuple() + assert o.class_rules == tuple() + assert o.all_rules == tuple() # Test default kwarg values: assert o.cli_name is name @@ -194,6 +198,8 @@ class test_Bytes(ClassChecker): o = self.cls('my_bytes') assert o.type is str assert o.rules == tuple() + assert o.class_rules == tuple() + assert o.all_rules == tuple() assert o.minlength is None assert o.maxlength is None assert o.length is None @@ -202,7 +208,9 @@ class test_Bytes(ClassChecker): # Test mixing length with minlength or maxlength: o = self.cls('my_bytes', length=5) assert o.length == 5 - assert len(o.rules) == 1 + assert len(o.class_rules) == 1 + assert len(o.rules) == 0 + assert len(o.all_rules) == 1 permutations = [ dict(minlength=3), dict(maxlength=7), @@ -210,7 +218,9 @@ class test_Bytes(ClassChecker): ] for kw in permutations: o = self.cls('my_bytes', **kw) - assert len(o.rules) == len(kw) + assert len(o.class_rules) == len(kw) + assert len(o.rules) == 0 + assert len(o.all_rules) == len(kw) for (key, value) in kw.iteritems(): assert getattr(o, key) == value e = raises(ValueError, self.cls, 'my_bytes', length=5, **kw) |