From b59cda5cfd78b9fb00aa88686f977a0f27db8f31 Mon Sep 17 00:00:00 2001 From: Riccardo Pittau Date: Tue, 1 Jun 2021 11:29:48 +0200 Subject: [PATCH] Fix import order in clustering tests Remove tox filter Change-Id: Ife111995d939f8373637b1668be2f955b58c6189 --- openstack/tests/unit/clustering/test_version.py | 2 +- openstack/tests/unit/clustering/v1/test_action.py | 3 +-- openstack/tests/unit/clustering/v1/test_build_info.py | 3 +-- openstack/tests/unit/clustering/v1/test_cluster_attr.py | 3 +-- openstack/tests/unit/clustering/v1/test_cluster_policy.py | 3 +-- openstack/tests/unit/clustering/v1/test_event.py | 3 +-- openstack/tests/unit/clustering/v1/test_policy.py | 3 +-- openstack/tests/unit/clustering/v1/test_policy_type.py | 3 +-- openstack/tests/unit/clustering/v1/test_profile.py | 3 +-- openstack/tests/unit/clustering/v1/test_receiver.py | 3 +-- tox.ini | 1 - 11 files changed, 10 insertions(+), 20 deletions(-) diff --git a/openstack/tests/unit/clustering/test_version.py b/openstack/tests/unit/clustering/test_version.py index 461a8f4e9..4908e52f4 100644 --- a/openstack/tests/unit/clustering/test_version.py +++ b/openstack/tests/unit/clustering/test_version.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. +from openstack.clustering import version from openstack.tests.unit import base -from openstack.clustering import version IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/clustering/v1/test_action.py b/openstack/tests/unit/clustering/v1/test_action.py index 62e13188d..539967cf7 100644 --- a/openstack/tests/unit/clustering/v1/test_action.py +++ b/openstack/tests/unit/clustering/v1/test_action.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import action +from openstack.tests.unit import base FAKE_CLUSTER_ID = 'ffaed25e-46f5-4089-8e20-b3b4722fd597' diff --git a/openstack/tests/unit/clustering/v1/test_build_info.py b/openstack/tests/unit/clustering/v1/test_build_info.py index 0056691d6..e94aa2d48 100644 --- a/openstack/tests/unit/clustering/v1/test_build_info.py +++ b/openstack/tests/unit/clustering/v1/test_build_info.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import build_info +from openstack.tests.unit import base FAKE = { diff --git a/openstack/tests/unit/clustering/v1/test_cluster_attr.py b/openstack/tests/unit/clustering/v1/test_cluster_attr.py index 3ef9641ce..9c88946b9 100644 --- a/openstack/tests/unit/clustering/v1/test_cluster_attr.py +++ b/openstack/tests/unit/clustering/v1/test_cluster_attr.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import cluster_attr as ca +from openstack.tests.unit import base FAKE = { diff --git a/openstack/tests/unit/clustering/v1/test_cluster_policy.py b/openstack/tests/unit/clustering/v1/test_cluster_policy.py index 463fa642e..21d4bf84b 100644 --- a/openstack/tests/unit/clustering/v1/test_cluster_policy.py +++ b/openstack/tests/unit/clustering/v1/test_cluster_policy.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import cluster_policy +from openstack.tests.unit import base FAKE = { diff --git a/openstack/tests/unit/clustering/v1/test_event.py b/openstack/tests/unit/clustering/v1/test_event.py index 9a972580f..01e489668 100644 --- a/openstack/tests/unit/clustering/v1/test_event.py +++ b/openstack/tests/unit/clustering/v1/test_event.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import event +from openstack.tests.unit import base FAKE = { diff --git a/openstack/tests/unit/clustering/v1/test_policy.py b/openstack/tests/unit/clustering/v1/test_policy.py index 6af6bd6b6..89b72ac02 100644 --- a/openstack/tests/unit/clustering/v1/test_policy.py +++ b/openstack/tests/unit/clustering/v1/test_policy.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import policy +from openstack.tests.unit import base FAKE_ID = 'ac5415bd-f522-4160-8be0-f8853e4bc332' diff --git a/openstack/tests/unit/clustering/v1/test_policy_type.py b/openstack/tests/unit/clustering/v1/test_policy_type.py index 63f88fdec..045366811 100644 --- a/openstack/tests/unit/clustering/v1/test_policy_type.py +++ b/openstack/tests/unit/clustering/v1/test_policy_type.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import policy_type +from openstack.tests.unit import base FAKE = { diff --git a/openstack/tests/unit/clustering/v1/test_profile.py b/openstack/tests/unit/clustering/v1/test_profile.py index abcaf098d..d37d17853 100644 --- a/openstack/tests/unit/clustering/v1/test_profile.py +++ b/openstack/tests/unit/clustering/v1/test_profile.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import profile +from openstack.tests.unit import base FAKE_ID = '9b127538-a675-4271-ab9b-f24f54cfe173' diff --git a/openstack/tests/unit/clustering/v1/test_receiver.py b/openstack/tests/unit/clustering/v1/test_receiver.py index 197cfb01e..5a46d6b1d 100644 --- a/openstack/tests/unit/clustering/v1/test_receiver.py +++ b/openstack/tests/unit/clustering/v1/test_receiver.py @@ -10,9 +10,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.tests.unit import base - from openstack.clustering.v1 import receiver +from openstack.tests.unit import base FAKE_ID = 'ae63a10b-4a90-452c-aef1-113a0b255ee3' diff --git a/tox.ini b/tox.ini index e585a015b..799cc3e56 100644 --- a/tox.ini +++ b/tox.ini @@ -124,7 +124,6 @@ exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build,openstack/_services_mix per-file-ignores = openstack/tests/unit/block_storage/*:H306,I100,I201,I202 openstack/tests/unit/cloud/*:H306,I100,I201,I202 - openstack/tests/unit/clustering/*:H306,I100,I201,I202 [flake8:local-plugins] extension =