Merge "Replace deprecated test.attr with decorators.attr"

This commit is contained in:
Jenkins 2017-07-26 22:41:49 +00:00 committed by Gerrit Code Review
commit 1fa9603f76
1 changed files with 6 additions and 6 deletions

View File

@ -16,8 +16,8 @@
from tempest import clients
from tempest import config
from tempest.lib.common.utils import test_utils
from tempest.lib import decorators
from tempest.lib import exceptions
from tempest import test
from congress_tempest_tests.tests.scenario import manager_congress
@ -48,7 +48,7 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
cls.datasource_id = manager_congress.get_datasource_id(
cls.os_admin.congress_client, 'keystonev3')
@test.attr(type='smoke')
@decorators.attr(type='smoke')
def test_keystone_users_table(self):
user_schema = (
self.os_admin.congress_client.show_datasource_table_schema(
@ -89,7 +89,7 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@test.attr(type='smoke')
@decorators.attr(type='smoke')
def test_keystone_roles_table(self):
role_schema = (
self.os_admin.congress_client.show_datasource_table_schema(
@ -125,7 +125,7 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@test.attr(type='smoke')
@decorators.attr(type='smoke')
def test_keystone_domains_table(self):
domains_schema = (
self.os_admin.congress_client.show_datasource_table_schema(
@ -161,7 +161,7 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@test.attr(type='smoke')
@decorators.attr(type='smoke')
def test_keystone_projects_table(self):
projects_schema = (
self.os_admin.congress_client.show_datasource_table_schema(
@ -197,7 +197,7 @@ class TestKeystoneV3Driver(manager_congress.ScenarioPolicyBase):
raise exceptions.TimeoutException("Data did not converge in time "
"or failure in server")
@test.attr(type='smoke')
@decorators.attr(type='smoke')
def test_update_no_error(self):
if not test_utils.call_until_true(
func=lambda: self.check_datasource_no_error('keystonev3'),