Git diff diff --git a/keystone/tests/backend_ldap_sql.conf b/keystone/tests/backend_ldap_sql.conf index 5579e75..e64e9bf 100644 --- a/keystone/tests/backend_ldap_sql.conf +++ b/keystone/tests/backend_ldap_sql.conf @@ -1,5 +1,6 @@ [sql] -connection = sqlite:// +#connection = sqlite:// +connection = mysql://root:qwerty@127.0.0.1/keystone_test?charset=utf8 #For a file based sqlite use #connection = sqlite:////tmp/keystone.db #To Test MySQL: diff --git a/keystone/tests/test_backend_ldap.py b/keystone/tests/test_backend_ldap.py index 103ccf2..aec2f66 100644 --- a/keystone/tests/test_backend_ldap.py +++ b/keystone/tests/test_backend_ldap.py @@ -980,6 +980,27 @@ class LdapIdentitySqlAssignment(sql.Base, tests.TestCase, BaseLDAPIdentity): self.skipTest( 'N/A: Not part of SQL backend')
+ def test_delete_domain_with_user_added(self): + domain = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex, + 'enabled': True} + project = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex, + 'domain_id': domain['id'], + 'description': uuid.uuid4().hex, 'enabled': True + } + self.assignment_api.create_domain(domain['id'], domain) + domain_ref = self.assignment_api.get_domain(domain['id']) + self.assertDictEqual(domain_ref, domain) + + self.assignment_api.create_grant(user_id=self.user_foo['id'], + domain_id=domain['id'], + role_id=self.role_member['id']) + self.assignment_api.delete_grant(user_id=self.user_foo['id'], + domain_id=domain['id'], + role_id=self.role_member['id']) + self.assignment_api.delete_domain(domain['id']) + self.assertRaises(exception.DomainNotFound, + self.assignment_api.get_domain, + domain['id'])
Git diff tests/backend_ ldap_sql. conf b/keystone/ tests/backend_ ldap_sql. conf tests/backend_ ldap_sql. conf tests/backend_ ldap_sql. conf /root:qwerty@ 127.0.0. 1/keystone_ test?charset= utf8 ////tmp/ keystone. db tests/test_ backend_ ldap.py b/keystone/ tests/test_ backend_ ldap.py tests/test_ backend_ ldap.py tests/test_ backend_ ldap.py Assignment( sql.Base, tests.TestCase, BaseLDAPIdentity):
self. skipTest(
diff --git a/keystone/
index 5579e75..e64e9bf 100644
--- a/keystone/
+++ b/keystone/
@@ -1,5 +1,6 @@
[sql]
-connection = sqlite://
+#connection = sqlite://
+connection = mysql:/
#For a file based sqlite use
#connection = sqlite:
#To Test MySQL:
diff --git a/keystone/
index 103ccf2..aec2f66 100644
--- a/keystone/
+++ b/keystone/
@@ -980,6 +980,27 @@ class LdapIdentitySql
'N/A: Not part of SQL backend')
+ def test_delete_ domain_ with_user_ added(self) : _api.create_ domain( domain[ 'id'], domain) _api.get_ domain( domain[ 'id']) Equal(domain_ ref, domain) _api.create_ grant(user_ id=self. user_foo[ 'id'], id=domain[ 'id'], self.role_ member[ 'id']) _api.delete_ grant(user_ id=self. user_foo[ 'id'], id=domain[ 'id'], self.role_ member[ 'id']) _api.delete_ domain( domain[ 'id']) es(exception. DomainNotFound, _api.get_ domain,
+ domain = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex,
+ 'enabled': True}
+ project = {'id': uuid.uuid4().hex, 'name': uuid.uuid4().hex,
+ 'domain_id': domain['id'],
+ 'description': uuid.uuid4().hex, 'enabled': True
+ }
+ self.assignment
+ domain_ref = self.assignment
+ self.assertDict
+
+ self.assignment
+ domain_
+ role_id=
+ self.assignment
+ domain_
+ role_id=
+ self.assignment
+ self.assertRais
+ self.assignment
+ domain['id'])