From 51bd68eaf5e2b21ce79f6b848a67f88abe9f7e11 Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Fri, 11 May 2012 04:00:30 -0400 Subject: Provide a better error message when deleting nonexistent attributes If --delattr is used on an attribute that's not present on an entry, and --{set,add}attr isn't being used on that same attribute, say that there's "no such attribute" instead of " does not contain ". https://fedorahosted.org/freeipa/ticket/2699 --- tests/test_xmlrpc/test_attr.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'tests/test_xmlrpc/test_attr.py') diff --git a/tests/test_xmlrpc/test_attr.py b/tests/test_xmlrpc/test_attr.py index 248d2157..8b78c97b 100644 --- a/tests/test_xmlrpc/test_attr.py +++ b/tests/test_xmlrpc/test_attr.py @@ -518,4 +518,37 @@ class test_attr(Declarative): error='must be an integer'), ), + dict( + desc='Try deleting bogus attribute', + command=('config_mod', [], dict(delattr=u'bogusattribute=xyz')), + expected=errors.ValidationError(name='bogusattribute', + error='No such attribute on this entry'), + ), + + dict( + desc='Try deleting empty attribute', + command=('config_mod', [], + dict(delattr=u'ipaCustomFields=See Also,seealso,false')), + expected=errors.ValidationError(name='ipacustomfields', + error='No such attribute on this entry'), + ), + + dict( + desc='Set and delete one value, plus try deleting a missing one', + command=('config_mod', [], dict( + delattr=[u'ipaCustomFields=See Also,seealso,false', + u'ipaCustomFields=Country,c,false'], + addattr=u'ipaCustomFields=See Also,seealso,false')), + expected=errors.AttrValueNotFound(attr='ipacustomfields', + value='Country,c,false'), + ), + + dict( + desc='Try to delete an operational attribute with --delattr', + command=('config_mod', [], dict( + delattr=u'creatorsName=cn=directory manager')), + expected=errors.DatabaseError( + desc='Server is unwilling to perform', info=''), + ), + ] -- cgit