commit dedaefd888c84ae7a36cfbfb0eba43d3f663dfef
author Lance Bragstad <lbragstad@gmail.com> Tue Dec 20 22:01:51 2016 +0000
committer Steve Martinelli <s.martinelli@gmail.com> Mon Jan 02 05:02:11 2017 +0000
tree 8e2821653a3f29b3d95a40ce1b6a8c9b72372b1f
parent 590c8be507edd49802401c35e0914ec637ab1d0d

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

keystone_tempest_plugin/tests/scenario/test_federated_authentication.py

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 @@
 
         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']