diff options
author | Jason Gerard DeRose <jderose@redhat.com> | 2010-02-19 03:13:11 -0700 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2010-02-19 18:10:37 -0500 |
commit | 47f2e618f9b5944b2c857351df71da635a3dc50a (patch) | |
tree | a830c31452d1b7e2335a9bc41ea477856b006d7a | |
parent | eab04c9d099b6361a3f64ada4b95e442a1e3095b (diff) | |
download | freeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.tar.gz freeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.tar.xz freeipa-47f2e618f9b5944b2c857351df71da635a3dc50a.zip |
Fix non XML-RPC tests
-rw-r--r-- | ipalib/cli.py | 9 | ||||
-rw-r--r-- | ipalib/crud.py | 4 | ||||
-rw-r--r-- | tests/test_ipalib/test_crud.py | 21 |
3 files changed, 15 insertions, 19 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index 213a9c450..715f2e177 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -293,15 +293,6 @@ class textui(backend.Backend): one_value_per_line=True): """ Print an ldap entry dict. - - For example: - - >>> entry = dict(sn='Last', givenname='First', uid='flast') - >>> ui = textui() - >>> ui.print_entry(entry) - givenname: First - sn: Last - uid: flast """ assert isinstance(entry, dict) assert isinstance(attr_map, dict) diff --git a/ipalib/crud.py b/ipalib/crud.py index 77c97f3f4..fa8b9ad08 100644 --- a/ipalib/crud.py +++ b/ipalib/crud.py @@ -76,7 +76,7 @@ us: >>> list(api.Command.user_add.args) ['login'] >>> list(api.Command.user_add.options) -['first', 'last'] +['first', 'last', 'all', 'raw'] Notice that ``'ipauniqueid'`` isn't included in the options for our ``user_add`` plugin. This is because of the ``'no_create'`` flag we used when defining the @@ -94,7 +94,7 @@ class created them for us: >>> list(api.Command.user_show.args) ['login'] >>> list(api.Command.user_show.options) -[] +['all', 'raw'] As you can see, `Retrieve` plugins take a single argument (the primary key) and no options. If needed, you can still specify options for your `Retrieve` plugin 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): |