summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-10-31 17:02:51 -0400
committerRob Crittenden <rcritten@redhat.com>2008-11-03 13:14:46 -0500
commitf18c84444d4ed87d79f3cb41156c6b66f49ccac3 (patch)
treed183eefff5a03097124aaeb33ebf31c76d251626
parenta9e8bda0cf2cc76593d7eb89138607aa2cc5bb61 (diff)
downloadfreeipa-f18c84444d4ed87d79f3cb41156c6b66f49ccac3.tar.gz
freeipa-f18c84444d4ed87d79f3cb41156c6b66f49ccac3.tar.xz
freeipa-f18c84444d4ed87d79f3cb41156c6b66f49ccac3.zip
Partially revert back change. Del shouldn't provide default options.
It can provide custom ones though, if defined with takes_params() in the class.
-rw-r--r--ipalib/crud.py2
-rw-r--r--tests/test_ipalib/test_crud.py5
2 files changed, 2 insertions, 5 deletions
diff --git a/ipalib/crud.py b/ipalib/crud.py
index 60c605dd9..867f9fe1f 100644
--- a/ipalib/crud.py
+++ b/ipalib/crud.py
@@ -47,8 +47,6 @@ class Del(frontend.Method):
yield self.obj.primary_key
def get_options(self):
- for param in self.obj.params_minus_pk():
- yield param
for option in self.takes_options:
yield option
diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py
index 259bc60de..ad391e2ea 100644
--- a/tests/test_ipalib/test_crud.py
+++ b/tests/test_ipalib/test_crud.py
@@ -130,9 +130,8 @@ class test_Del(CrudChecker):
Test the `ipalib.crud.Del.get_options` method.
"""
api = self.get_api()
- assert list(api.Method.user_verb.options) == \
- ['givenname', 'sn', 'initials']
- assert len(api.Method.user_verb.options) == 3
+ assert list(api.Method.user_verb.options) == []
+ assert len(api.Method.user_verb.options) == 0
class test_Mod(CrudChecker):