From dedaefd888c84ae7a36cfbfb0eba43d3f663dfef Mon Sep 17 00:00:00 2001 From: Lance Bragstad Date: Tue, 20 Dec 2016 22:01:51 +0000 Subject: [PATCH] Fix import ordering in tempest plugins For some reason the third-party imports were divided into two separate groups. This commit combines them to follow the convention established throughout the rest of the project. Change-Id: Ice1a681938aef96d0d289a83cadc1cde2f12eb1e --- .../tests/scenario/test_federated_authentication.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/keystone_tempest_plugin/tests/scenario/test_federated_authentication.py b/keystone_tempest_plugin/tests/scenario/test_federated_authentication.py index 2ac6958..24d7416 100644 --- a/keystone_tempest_plugin/tests/scenario/test_federated_authentication.py +++ b/keystone_tempest_plugin/tests/scenario/test_federated_authentication.py @@ -14,10 +14,9 @@ from lxml import etree from six.moves import http_client - from tempest import config from tempest.lib.common.utils import data_utils -from testtools import skipUnless +import testtools from keystone_tempest_plugin.tests import base @@ -157,13 +156,13 @@ class TestSaml2EcpFederatedAuthentication(base.BaseIdentityTest): return resp - @skipUnless(CONF.identity_feature_enabled.federation, - "Federated Identity feature not enabled") + @testtools.skipUnless(CONF.identity_feature_enabled.federation, + "Federated Identity feature not enabled") def test_request_unscoped_token(self): self._request_unscoped_token() - @skipUnless(CONF.identity_feature_enabled.federation, - "Federated Identity feature not enabled") + @testtools.skipUnless(CONF.identity_feature_enabled.federation, + "Federated Identity feature not enabled") def test_request_scoped_token(self): resp = self._request_unscoped_token() token_id = resp.headers['X-Subject-Token']