Drop allowing old test.idempotent_id

test.idempotent_id should not be allowed anymore on the check
to block containing such wrong usage into tempest anymore.

Change-Id: Ie45b5d4a28b645ad5145ac37decf70f2f08d4229
This commit is contained in:
Ken'ichi Ohmichi 2017-03-06 16:03:17 -08:00
parent 5e1543f753
commit 8a08211b4b
2 changed files with 3 additions and 8 deletions

View File

@ -313,7 +313,7 @@ that is a unique ``uuid-4`` instance. This ID is used to complement the fully
qualified test name and track test functionality through refactoring. The
format of the metadata looks like::
@test.idempotent_id('585e934c-448e-43c4-acbf-d06a9b899997')
@decorators.idempotent_id('585e934c-448e-43c4-acbf-d06a9b899997')
def test_list_servers_with_detail(self):
# The created server should be in the detailed list of all servers
...

View File

@ -26,10 +26,6 @@ import uuid
from oslo_utils import uuidutils
import six.moves.urllib.parse as urlparse
# TODO(oomichi): Need to remove this after switching all modules to decorators
# on all OpenStack projects because they runs check-uuid on their own gates.
OLD_DECORATOR_MODULE = 'test'
DECORATOR_MODULE = 'decorators'
DECORATOR_NAME = 'idempotent_id'
DECORATOR_IMPORT = 'tempest.%s' % DECORATOR_MODULE
@ -128,8 +124,7 @@ class TestChecker(object):
hasattr(decorator.func, 'attr') and
decorator.func.attr == DECORATOR_NAME and
hasattr(decorator.func, 'value') and
(decorator.func.value.id == DECORATOR_MODULE or
decorator.func.value.id == OLD_DECORATOR_MODULE)):
decorator.func.value.id == DECORATOR_MODULE):
for arg in decorator.args:
idempotent_id = ast.literal_eval(arg)
return idempotent_id
@ -361,7 +356,7 @@ def run():
sys.exit("@decorators.idempotent_id existence and uniqueness checks "
"failed\n"
"Run 'tox -v -euuidgen' to automatically fix tests with\n"
"missing @test.idempotent_id decorators.")
"missing @decorators.idempotent_id decorators.")
if __name__ == '__main__':
run()