openstack/manila
Code Issues Proposed changes

Merge "Fix concurrency issue in security-service tempest test"

Browse Source
This commit is contained in:
Jenkins 2014-11-11 22:59:49 +00:00 committed by Gerrit Code Review
commit fad5e37e60
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/tempest/tempest/api/share/test_security_services.py
View File

@ -80,7 +80,7 @@ class SecurityServiceListMixin(object):
[self.assertIn(key, s_s.keys()) for s_s in listed for key in keys] [self.assertIn(key, s_s.keys()) for s_s in listed for key in keys]
@test.attr(type=["gate", "smoke"]) @test.attr(type=["gate", "smoke"])
def test_list_security_services_filter_by_ss_attributes(self): def test_list_security_services_detailed_filter_by_ss_attributes(self):
search_opts = { search_opts = {
'status': 'NEW', 'status': 'NEW',
'name': 'ss_ldap', 'name': 'ss_ldap',
@ -91,12 +91,12 @@ class SecurityServiceListMixin(object):
'domain': 'fake_domain_1', 'domain': 'fake_domain_1',
} }
resp, listed = self.shares_client.list_security_services( resp, listed = self.shares_client.list_security_services(
detailed=True,
params=search_opts) params=search_opts)
self.assertEqual(1, len(listed)) self.assertTrue(any(self.ss_ldap['id'] == ss['id'] for ss in listed))
self.assertEqual(self.ss_ldap['id'], listed[0]['id']) for ss in listed:
self.assertTrue(all(ss[key] == value for key, value
keys = ["name", "id", "status", "type", ] in six.iteritems(search_opts)))
[self.assertIn(key, s_s.keys()) for s_s in listed for key in keys]
class SecurityServicesTest(base.BaseSharesTest, class SecurityServicesTest(base.BaseSharesTest,