summaryrefslogtreecommitdiffstats
path: root/tests/test_backend.py
diff options
context:
space:
mode:
authorDolph Mathews <dolph.mathews@gmail.com>2013-02-19 10:39:22 -0600
committerHenry Nash <henryn@linux.vnet.ibm.com>2013-03-19 19:19:59 +0000
commitcd3f58a8d05010838bd5e2d095103c2623499112 (patch)
treeb0fe0e0553c71a4d5f603e4acf78e53fc5dd09e4 /tests/test_backend.py
parenta066b69fbe1ad2e3f577a3a21487d2eaebe22a15 (diff)
downloadkeystone-cd3f58a8d05010838bd5e2d095103c2623499112.tar.gz
keystone-cd3f58a8d05010838bd5e2d095103c2623499112.tar.xz
keystone-cd3f58a8d05010838bd5e2d095103c2623499112.zip
Validate domains unconditionally (bug 1130236)
Ensure that we validate the domain status of user/project for a user authenticating via the v2 API. This patch builds on the initial functional change done by Dolph, and fixes up the tests that broke sure to domain being required in any tests that setup data directly in the backends. Fixes Bug #1130236 Change-Id: I66dfd453fb95fa4fa3fde713b663386a2c2ecdf8
Diffstat (limited to 'tests/test_backend.py')
-rw-r--r--tests/test_backend.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/test_backend.py b/tests/test_backend.py
index ac54aba4..fea52b8e 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -23,7 +23,6 @@ from keystone.catalog import core
from keystone import config
from keystone import exception
from keystone.openstack.common import timeutils
-from keystone import config
from keystone import test
@@ -1582,10 +1581,11 @@ class IdentityTests(object):
self.identity_api.create_domain(domain1['id'], domain1)
self.identity_api.create_domain(domain2['id'], domain2)
domains = self.identity_api.list_domains()
- self.assertEquals(len(domains), 2)
+ self.assertEquals(len(domains), 3)
domain_ids = []
for domain in domains:
domain_ids.append(domain.get('id'))
+ self.assertIn(DEFAULT_DOMAIN_ID, domain_ids)
self.assertIn(domain1['id'], domain_ids)
self.assertIn(domain2['id'], domain_ids)