summaryrefslogtreecommitdiffstats
path: root/tests/test_ipalib
diff options
context:
space:
mode:
authorJason Gerard DeRose <jderose@redhat.com>2010-02-19 03:13:11 -0700
committerRob Crittenden <rcritten@redhat.com>2010-02-19 18:10:37 -0500
commit47f2e618f9b5944b2c857351df71da635a3dc50a (patch)
treea830c31452d1b7e2335a9bc41ea477856b006d7a /tests/test_ipalib
parenteab04c9d099b6361a3f64ada4b95e442a1e3095b (diff)
downloadfreeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.tar.gz
freeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.tar.xz
freeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.zip
Fix non XML-RPC tests
Diffstat (limited to 'tests/test_ipalib')
-rw-r--r--tests/test_ipalib/test_crud.py21
1 files changed, 13 insertions, 8 deletions
diff --git a/tests/test_ipalib/test_crud.py b/tests/test_ipalib/test_crud.py
index 969fb4fd1..b8399e57a 100644
--- a/tests/test_ipalib/test_crud.py
+++ b/tests/test_ipalib/test_crud.py
@@ -74,12 +74,12 @@ class test_Create(CrudChecker):
"""
api = self.get_api()
assert list(api.Method.user_verb.options) == \
- ['givenname', 'sn', 'initials']
+ ['givenname', 'sn', 'initials', 'all', 'raw']
for param in api.Method.user_verb.options():
assert param.required is True
api = self.get_api(options=('extra?',))
assert list(api.Method.user_verb.options) == \
- ['givenname', 'sn', 'initials', 'extra']
+ ['givenname', 'sn', 'initials', 'extra', 'all', 'raw']
assert api.Method.user_verb.options.extra.required is False
@@ -104,9 +104,12 @@ class test_Update(CrudChecker):
"""
api = self.get_api()
assert list(api.Method.user_verb.options) == \
- ['givenname', 'initials', 'uidnumber']
+ ['givenname', 'initials', 'uidnumber', 'all', 'raw']
for param in api.Method.user_verb.options():
- assert param.required is False
+ if param.name in ['all', 'raw']:
+ assert param.required is True
+ else:
+ assert param.required is False
class test_Retrieve(CrudChecker):
@@ -129,8 +132,7 @@ class test_Retrieve(CrudChecker):
Test the `ipalib.crud.Retrieve.get_options` method.
"""
api = self.get_api()
- assert list(api.Method.user_verb.options) == []
- assert len(api.Method.user_verb.options) == 0
+ assert list(api.Method.user_verb.options) == ['all', 'raw']
class test_Delete(CrudChecker):
@@ -178,9 +180,12 @@ class test_Search(CrudChecker):
"""
api = self.get_api()
assert list(api.Method.user_verb.options) == \
- ['givenname', 'sn', 'uid', 'initials']
+ ['givenname', 'sn', 'uid', 'initials', 'all', 'raw']
for param in api.Method.user_verb.options():
- assert param.required is False
+ if param.name in ['all', 'raw']:
+ assert param.required is True
+ else:
+ assert param.required is False
class test_CrudBackend(ClassChecker):