Fix expected error messages in tests

Have the test suite check error messages.
Since XMLRPC doesn't give us structured error information, just
compare the resulting text.
Fix messages that tests expect to cause.

Minor changes:

Make netgroup-mod's NotFound message consistent with other objects
and methods.

In test_automember_plugin, test with nonexistent automember rules
of both types, instead of nonexistent users.

https://fedorahosted.org/freeipa/ticket/2549

1 files changed, 27 insertions, 12 deletions

diff --git a/tests/test_xmlrpc/test_automember_plugin.py b/tests/test_xmlrpc/test_automember_plugin.py
index b59899b45..ceae8c3ff 100644
--- a/tests/test_xmlrpc/test_automember_plugin.py
+++ b/tests/test_xmlrpc/test_automember_plugin.py
@@ -76,33 +76,48 @@ class test_automember(Declarative):
     tests = [
 
         dict(
-            desc='Try to retrieve non-existent %r' % user1,
-            command=('user_show', [user1], {}),
-            expected=errors.NotFound(reason='no such entry'),
+            desc='Try to retrieve non-existent group rule %r' % group1,
+            command=('automember_add', [group1],
+                dict(description=u'Test desc', type=u'group')),
+            expected=errors.NotFound(reason=u'Group: %s not found!' % group1),
         ),
 
+        dict(
+            desc='Try to update non-existent group rule %r' % group1,
+            command=('automember_add', [group1], dict(type=u'group')),
+            expected=errors.NotFound(reason=u'Group: %s not found!' % group1),
+        ),
 
         dict(
-            desc='Try to update non-existent %r' % user1,
-            command=('user_mod', [user1], dict(givenname=u'Foo')),
-            expected=errors.NotFound(reason='no such entry'),
+            desc='Try to delete non-existent group rule %r' % group1,
+            command=('automember_del', [group1], dict(type=u'group')),
+            expected=errors.NotFound(reason=u': auto_member_rule not found'),
         ),
 
 
         dict(
-            desc='Try to delete non-existent %r' % user1,
-            command=('user_del', [user1], {}),
-            expected=errors.NotFound(reason='no such entry'),
+            desc='Try to retrieve non-existent hostgroup rule %r' % hostgroup1,
+            command=('automember_add', [hostgroup1],
+                dict(description=u'Test desc', type=u'hostgroup')),
+            expected=errors.NotFound(
+                reason=u'Group: %s not found!' % hostgroup1),
         ),
 
+        dict(
+            desc='Try to update non-existent hostgroup rule %r' % hostgroup1,
+            command=('automember_add', [hostgroup1], dict(type=u'hostgroup')),
+            expected=errors.NotFound(
+                reason=u'Group: %s not found!' % hostgroup1),
+        ),
 
         dict(
-            desc='Try to rename non-existent %r' % user1,
-            command=('user_mod', [user1], dict(setattr=u'uid=tuser')),
-            expected=errors.NotFound(reason='no such entry'),
+            desc='Try to delete non-existent hostgroup rule %r' % hostgroup1,
+            command=('automember_del', [hostgroup1], dict(type=u'hostgroup')),
+            expected=errors.NotFound(reason=u': auto_member_rule not found'),
         ),
 
 
+
         dict(
             desc='Create %r' % group1,
             command=(