openstack
/
congress
Code Issues Proposed changes

Merge "Enable keystone, cinder, ceilometer tempest tests"

This commit is contained in:
Jenkins 2015-12-09 17:34:32 +00:00 committed by Gerrit Code Review
parent 30631287e2 959e0b796e
commit 40ffde817a
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py
View File

@ -14,7 +14,6 @@
# under the License.
from oslo_log import log as logging
from tempest_lib import decorators
from tempest_lib import exceptions
from tempest import clients # noqa
@ -45,7 +44,6 @@ class TestCeilometerDriver(manager_congress.ScenarioPolicyBase):
cls.datasource_id = manager_congress.get_datasource_id(
cls.admin_manager.congress_client, 'ceilometer')
@decorators.skip_because(bug='1486246')
@test.attr(type='smoke')
def test_ceilometer_meters_table(self):
meter_schema = (

4
congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py
View File

@ -14,7 +14,6 @@
# under the License.
from oslo_log import log as logging
from tempest_lib import decorators
from tempest_lib import exceptions
from tempest import clients # noqa
@ -51,7 +50,6 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
cls.datasource_id = manager_congress.get_datasource_id(
cls.admin_manager.congress_client, 'cinder')
@decorators.skip_because(bug='1486246')
@test.attr(type='smoke')
def test_cinder_volumes_table(self):
volume_schema = (
@ -63,7 +61,7 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
def _check_data_table_cinder_volumes():
# Fetch data from cinder each time, because this test may start
# before cinder has all the users.
volumes = self.cinder.list_volumes()
volumes = self.cinder.list_volumes()['volumes']
volumes_map = {}
for volume in volumes:
volumes_map[volume['id']] = volume

10
congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
View File

@ -14,7 +14,6 @@
# under the License.
from oslo_log import log as logging
from tempest_lib import decorators
from tempest_lib import exceptions
from tempest import clients # noqa
@ -46,7 +45,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
cls.datasource_id = manager_congress.get_datasource_id(
cls.admin_manager.congress_client, 'keystone')
@decorators.skip_because(bug='1486246')
@test.attr(type='smoke')
def test_keystone_users_table(self):
user_schema = (
@ -58,7 +56,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
def _check_data_table_keystone_users():
# Fetch data from keystone each time, because this test may start
# before keystone has all the users.
users = self.keystone.get_users()
users = self.keystone.list_users()['users']
user_map = {}
for user in users:
user_map[user['id']] = user
@ -89,7 +87,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@decorators.skip_because(bug='1486246')
@test.attr(type='smoke')
def test_keystone_roles_table(self):
role_schema = (
@ -101,7 +98,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
def _check_data_table_keystone_roles():
# Fetch data from keystone each time, because this test may start
# before keystone has all the users.
roles = self.keystone.list_roles()
roles = self.keystone.list_roles()['roles']
roles_map = {}
for role in roles:
roles_map[role['id']] = role
@ -125,7 +122,6 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@decorators.skip_because(bug='1486246')
@test.attr(type='smoke')
def test_keystone_tenants_table(self):
tenant_schema = (
@ -137,7 +133,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
def _check_data_table_keystone_tenants():
# Fetch data from keystone each time, because this test may start
# before keystone has all the users.
tenants = self.keystone.list_tenants()
tenants = self.keystone.list_tenants()['tenants']
tenants_map = {}
for tenant in tenants:
tenants_map[tenant['id']] = tenant