Merge "Switch to enabled version of identity clients"
diff --git a/patrole_tempest_plugin/tests/api/identity/v3/test_tokens_negative_rbac.py b/patrole_tempest_plugin/tests/api/identity/v3/test_tokens_negative_rbac.py
index 7b3a658..90952a8 100644
--- a/patrole_tempest_plugin/tests/api/identity/v3/test_tokens_negative_rbac.py
+++ b/patrole_tempest_plugin/tests/api/identity/v3/test_tokens_negative_rbac.py
@@ -16,7 +16,6 @@
from tempest import config
from tempest.lib import decorators
from tempest.lib import exceptions as lib_exc
-from tempest import test
from patrole_tempest_plugin import rbac_rule_validation
from patrole_tempest_plugin.tests.api.identity import rbac_base
@@ -43,7 +42,7 @@
self.os_alt.auth_provider.credentials.password)
@decorators.idempotent_id('c83c8f1a-79cb-4dc4-b55f-c7d2bfd98b1e')
- @test.attr(type=['negative'])
+ @decorators.attr(type=['negative'])
@rbac_rule_validation.action(
service="keystone",
rule="identity:validate_token",
@@ -62,7 +61,7 @@
raise e
@decorators.idempotent_id('2786a55d-a818-433a-af7a-41ebf72ab4da')
- @test.attr(type=['negative'])
+ @decorators.attr(type=['negative'])
@rbac_rule_validation.action(
service="keystone",
rule="identity:revoke_token",
@@ -81,7 +80,7 @@
raise e
@decorators.idempotent_id('1ea02ac0-9a96-44bd-bdc3-4dae3c10cc2e')
- @test.attr(type=['negative'])
+ @decorators.attr(type=['negative'])
@rbac_rule_validation.action(
service="keystone",
rule="identity:check_token",
diff --git a/test-requirements.txt b/test-requirements.txt
index 34b2238..9898d4a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@
sphinx>=1.6.2 # BSD
openstackdocstheme>=1.11.0 # Apache-2.0
reno!=2.3.1,>=1.8.0 # Apache-2.0
-fixtures>=3.0.0 # Apache-2.0/BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
mock>=2.0 # BSD
coverage!=4.4,>=4.0 # Apache-2.0
nose # LGPL