diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-09-15 13:52:35 +0200 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2016-09-22 13:02:57 +0200 |
| commit | 330a3ca93101bcec82ec5d3add14586871864bdd (patch) | |
| tree | 03f997cb24675c1bfab0c9598c62a66a626502ec /ipatests/test_install | |
| parent | 2e0afab5f2a47149580b4bc79093cdbb77f489c3 (diff) | |
| download | freeipa-330a3ca93101bcec82ec5d3add14586871864bdd.tar.gz freeipa-330a3ca93101bcec82ec5d3add14586871864bdd.tar.xz freeipa-330a3ca93101bcec82ec5d3add14586871864bdd.zip | |
Remove update_from_dict() method
update_from_dict() method is not used anywhere in the project,
it only makes the tests fail. Removed it and its tests.
https://fedorahosted.org/freeipa/ticket/6311
Reviewed-By: Alexander Bokovoy <abokovoy@redhat.com>
Diffstat (limited to 'ipatests/test_install')
| -rw-r--r-- | ipatests/test_install/test_updates.py | 95 |
1 files changed, 0 insertions, 95 deletions
diff --git a/ipatests/test_install/test_updates.py b/ipatests/test_install/test_updates.py index 3fa2cd7e1..01e06ca2e 100644 --- a/ipatests/test_install/test_updates.py +++ b/ipatests/test_install/test_updates.py @@ -253,98 +253,3 @@ class test_update(unittest.TestCase): with self.assertRaises(BadSyntax): modified = self.updater.update( [os.path.join(self.testdir, "9_badsyntax.update")]) - - def test_from_dict(self): - """ - Test updating from a dict. - - This replicates what was done in test 1. - """ - - # First make sure we're clean - with self.assertRaises(errors.NotFound): - entries = self.ld.get_entries( - self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) - - with self.assertRaises(errors.NotFound): - entries = self.ld.get_entries( - self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) - - - update = { - self.container_dn: - {'dn': self.container_dn, - 'updates': ['add:objectClass: top', - 'add:objectClass: nsContainer', - 'add:cn: test' - ], - }, - self.user_dn: - {'dn': self.user_dn, - 'updates': ['add:objectclass: top', - 'add:objectclass: person', - 'add:objectclass: posixaccount', - 'add:objectclass: krbprincipalaux', - 'add:objectclass: inetuser', - 'add:homedirectory: /home/tuser', - 'add:loginshell: /bin/bash', - 'add:sn: User', - 'add:uid: tuser', - 'add:uidnumber: 999', - 'add:gidnumber: 999', - 'add:cn: Test User', - ], - }, - } - - modified = self.updater.update_from_dict(update) - self.assertTrue(modified) - - entries = self.ld.get_entries( - self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) - self.assertEqual(len(entries), 1) - entry = entries[0] - - objectclasses = entry.get('objectclass') - for item in ('top', 'nsContainer'): - self.assertTrue(item in objectclasses) - - self.assertEqual(entry.single_value['cn'], 'test') - - entries = self.ld.get_entries( - self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) - self.assertEqual(len(entries), 1) - entry = entries[0] - - objectclasses = entry.get('objectclass') - for item in ('top', 'person', 'posixaccount', 'krbprincipalaux', 'inetuser'): - self.assertTrue(item in objectclasses) - - self.assertEqual(entry.single_value['loginshell'], paths.BASH) - self.assertEqual(entry.single_value['sn'], 'User') - self.assertEqual(entry.single_value['uid'], 'tuser') - self.assertEqual(entry.single_value['cn'], 'Test User') - - # Now delete - - update = { - self.container_dn: - {'dn': self.container_dn, - 'deleteentry': None, - }, - self.user_dn: - {'dn': self.user_dn, - 'deleteentry': 'deleteentry: reset: nada', - }, - } - - modified = self.updater.update_from_dict(update) - self.assertTrue(modified) - - with self.assertRaises(errors.NotFound): - entries = self.ld.get_entries( - self.container_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) - - with self.assertRaises(errors.NotFound): - entries = self.ld.get_entries( - self.user_dn, self.ld.SCOPE_BASE, 'objectclass=*', ['*']) |
