From a066b69fbe1ad2e3f577a3a21487d2eaebe22a15 Mon Sep 17 00:00:00 2001 From: Allan Feid Date: Tue, 12 Mar 2013 15:47:45 -0400 Subject: Fix live ldap tests Clean up clear_live_database so that all fixture data is removed. Make sure we use the configured trees for each ldap object in tests. Ensure all live tests pass or are skipped where appropriate. Fixes: bug #1154277 Change-Id: I2eb4efe78e2c9d2a18bce339765b3ab5d20ac8f5 --- keystone/identity/backends/ldap/core.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'keystone') diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index cc60d0b9..72446ce3 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -176,7 +176,9 @@ class Identity(identity.Driver): data = tenant.copy() if 'id' not in data or data['id'] is None: data['id'] = str(uuid.uuid4().hex) - return self.project.create(tenant) + if 'description' in data and data['description'] in ['', None]: + data.pop('description') + return self.project.create(data) def update_project(self, tenant_id, tenant): if 'name' in tenant: -- cgit