summaryrefslogtreecommitdiffstats
path: root/ipatests/test_xmlrpc
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2016-05-18 10:03:39 +0200
committerJan Cholasta <jcholast@redhat.com>2016-05-25 16:06:26 +0200
commit2f6b333187e150369e9f761520aaebca0b45c011 (patch)
treeae02eeb7cd0d3bcfbaf78cebd5b938d9d14c8488 /ipatests/test_xmlrpc
parente0275abe6f5192e68b7f57acf37b01aaa89003ea (diff)
downloadfreeipa-2f6b333187e150369e9f761520aaebca0b45c011.tar.gz
freeipa-2f6b333187e150369e9f761520aaebca0b45c011.tar.xz
freeipa-2f6b333187e150369e9f761520aaebca0b45c011.zip
frontend: re-raise remote RequirementError using CLI name in CLI
https://fedorahosted.org/freeipa/ticket/4739 Reviewed-By: David Kupka <dkupka@redhat.com>
Diffstat (limited to 'ipatests/test_xmlrpc')
-rw-r--r--ipatests/test_xmlrpc/test_attr.py4
-rw-r--r--ipatests/test_xmlrpc/test_config_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_dns_plugin.py2
-rw-r--r--ipatests/test_xmlrpc/test_permission_plugin.py4
4 files changed, 6 insertions, 6 deletions
diff --git a/ipatests/test_xmlrpc/test_attr.py b/ipatests/test_xmlrpc/test_attr.py
index 83a51b56b..dfc27bbe9 100644
--- a/ipatests/test_xmlrpc/test_attr.py
+++ b/ipatests/test_xmlrpc/test_attr.py
@@ -147,7 +147,7 @@ class TestAttrOnUser(XMLRPC_test):
""" Try setting givenname to None with setattr in user """
user.ensure_exists()
command = user.make_update_command(dict(setattr=(u'givenname=')))
- with raises_exact(errors.RequirementError(name='givenname')):
+ with raises_exact(errors.RequirementError(name='first')):
command()
def test_set_givenname_to_none_with_option(self, user):
@@ -219,7 +219,7 @@ class TestAttrOnConfigs(XMLRPC_test):
**dict(delattr=u'ipasearchrecordslimit=100')
)
with raises_exact(errors.RequirementError(
- name='ipasearchrecordslimit')):
+ name='searchrecordslimit')):
command()
def test_set_nonexistent_attribute(self, user):
diff --git a/ipatests/test_xmlrpc/test_config_plugin.py b/ipatests/test_xmlrpc/test_config_plugin.py
index 2f57fd236..dc480a652 100644
--- a/ipatests/test_xmlrpc/test_config_plugin.py
+++ b/ipatests/test_xmlrpc/test_config_plugin.py
@@ -61,7 +61,7 @@ class test_config(Declarative):
desc='Try to remove ipausersearchfields',
command=('config_mod', [],
dict(delattr=u'ipausersearchfields=uid,givenname,sn,telephonenumber,ou,title')),
- expected=errors.RequirementError(name='ipausersearchfields'),
+ expected=errors.RequirementError(name='usersearch'),
),
dict(
diff --git a/ipatests/test_xmlrpc/test_dns_plugin.py b/ipatests/test_xmlrpc/test_dns_plugin.py
index fb98d0e6f..0953de8b5 100644
--- a/ipatests/test_xmlrpc/test_dns_plugin.py
+++ b/ipatests/test_xmlrpc/test_dns_plugin.py
@@ -1179,7 +1179,7 @@ class test_dns(Declarative):
dict(
desc='Try to modify SRV record in zone %r without specifying modified value' % (zone1),
command=('dnsrecord_mod', [zone1, u'_foo._tcp'], {'srv_part_priority': 1,}),
- expected=errors.RequirementError(name='srvrecord'),
+ expected=errors.RequirementError(name='srv_rec'),
),
dict(
diff --git a/ipatests/test_xmlrpc/test_permission_plugin.py b/ipatests/test_xmlrpc/test_permission_plugin.py
index 243ea44d3..cefa93f55 100644
--- a/ipatests/test_xmlrpc/test_permission_plugin.py
+++ b/ipatests/test_xmlrpc/test_permission_plugin.py
@@ -195,7 +195,7 @@ class test_permission_negative(Declarative):
attrs=[u'sn'],
)
),
- expected=errors.RequirementError(name='ipapermright'),
+ expected=errors.RequirementError(name='right'),
),
dict(
@@ -310,7 +310,7 @@ class test_permission_negative(Declarative):
ipapermright=None,
)
),
- expected=errors.RequirementError(name='ipapermright'),
+ expected=errors.RequirementError(name='right'),
),
dict(