diff options
| author | Brant Knudson <bknudson@us.ibm.com> | 2014-09-13 14:10:45 -0500 |
|---|---|---|
| committer | Brant Knudson <bknudson@us.ibm.com> | 2014-09-14 19:24:04 -0500 |
| commit | 15e0c974fe92ca006832da458807dbe7b55dd76b (patch) | |
| tree | 18e8f47d2049e708650e44818d18f022bbfc5fd3 | |
| parent | 519161422dab4c25df79b6d4db35f7613847afd6 (diff) | |
| download | keystone-15e0c974fe92ca006832da458807dbe7b55dd76b.tar.gz | |
Refactor FakeLdap to share delete code
FakeLdap is changed to implement delete_s using delete_ext_s.
Change-Id: Ibf63f6e13da830b57a9f7ea5b9689d52d7bdf690
| -rw-r--r-- | keystone/tests/fakeldap.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/keystone/tests/fakeldap.py b/keystone/tests/fakeldap.py index 670e3b962..481bbeaa0 100644 --- a/keystone/tests/fakeldap.py +++ b/keystone/tests/fakeldap.py @@ -308,18 +308,7 @@ class FakeLdap(core.LDAPHandler): def delete_s(self, dn): """Remove the ldap object at specified dn.""" - if server_fail: - raise ldap.SERVER_DOWN - - key = self.key(dn) - LOG.debug('delete item: dn=%s', core.utf8_decode(dn)) - try: - del self.db[key] - except KeyError: - LOG.debug('delete item failed: dn=%s not found.', - core.utf8_decode(dn)) - raise ldap.NO_SUCH_OBJECT - self.db.sync() + return self.delete_ext_s(dn, serverctrls=[]) def _getChildren(self, dn): return [k for k, v in six.iteritems(self.db) @@ -550,9 +539,6 @@ class FakeLdapNoSubtreeDelete(FakeLdap): an entry that has children. """ - def delete_s(self, dn): - self.delete_ext_s(dn, [], None) - def delete_ext_s(self, dn, serverctrls, clientctrls=None): """Remove the ldap object at specified dn.""" if server_fail: |