diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2011-04-13 10:48:07 -0400 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2011-04-13 17:29:16 +0200 |
| commit | 9cac1d88fcffcce65018869827eadcfc0ff157f1 (patch) | |
| tree | 9c99b92a5650b7b2ce435278c388b50a05d71e43 /tests/test_xmlrpc | |
| parent | 1ac3ed2c271accc0776a3cc34fbe607acf62da17 (diff) | |
| download | freeipa-9cac1d88fcffcce65018869827eadcfc0ff157f1.tar.gz freeipa-9cac1d88fcffcce65018869827eadcfc0ff157f1.tar.xz freeipa-9cac1d88fcffcce65018869827eadcfc0ff157f1.zip | |
Sort entries returned by *-find by the primary key (if any).
Do a server-side sort if there is a primary key.
Fix a couple of tests that were failing due to the new sorting.
ticket 794
Diffstat (limited to 'tests/test_xmlrpc')
| -rw-r--r-- | tests/test_xmlrpc/test_automount_plugin.py | 4 | ||||
| -rw-r--r-- | tests/test_xmlrpc/test_group_plugin.py | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/test_xmlrpc/test_automount_plugin.py b/tests/test_xmlrpc/test_automount_plugin.py index c2fa15ac3..c5dd619e2 100644 --- a/tests/test_xmlrpc/test_automount_plugin.py +++ b/tests/test_xmlrpc/test_automount_plugin.py @@ -119,8 +119,8 @@ class test_automount(XMLRPC_test): res = api.Command['automountkey_find'](self.locname, self.mapname, raw=True)['result'] assert res assert len(res) == 2 - assert_attr_equal(res[1], 'automountkey', self.keyname) - assert_attr_equal(res[1], 'automountinformation', self.info) + assert_attr_equal(res[0], 'automountkey', self.keyname) + assert_attr_equal(res[0], 'automountinformation', self.info) def test_9_automountkey_mod(self): """ diff --git a/tests/test_xmlrpc/test_group_plugin.py b/tests/test_xmlrpc/test_group_plugin.py index 5cb94f34a..a49193261 100644 --- a/tests/test_xmlrpc/test_group_plugin.py +++ b/tests/test_xmlrpc/test_group_plugin.py @@ -336,17 +336,17 @@ class test_group(Declarative): 'description': [u'Account administrators group'], }, { - 'dn': u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn, - 'gidnumber': [fuzzy_digits], - 'cn': [u'ipausers'], - 'description': [u'Default group for all users'], - }, - { 'dn': u'cn=editors,cn=groups,cn=accounts,%s' % api.env.basedn, 'gidnumber': [fuzzy_digits], 'cn': [u'editors'], 'description': [u'Limited admins who can edit other users'], }, + { + 'dn': u'cn=ipausers,cn=groups,cn=accounts,%s' % api.env.basedn, + 'gidnumber': [fuzzy_digits], + 'cn': [u'ipausers'], + 'description': [u'Default group for all users'], + }, dict( dn=u'cn=%s,cn=groups,cn=accounts,%s' % (group1, api.env.basedn), cn=[group1], |