From 1474259b651e4f642c1cf9fe13cdf25b280e95f2 Mon Sep 17 00:00:00 2001 From: Tatjana Dehler Date: Mon, 12 Oct 2020 15:58:17 +0200 Subject: [PATCH] mgr/dashboard/qa: add isort check Add isort check to the QA test files and fix issues. Fixes: https://tracker.ceph.com/issues/47757 Signed-off-by: Tatjana Dehler --- qa/tasks/mgr/dashboard/helper.py | 6 ++---- qa/tasks/mgr/dashboard/test_auth.py | 2 +- qa/tasks/mgr/dashboard/test_cephfs.py | 2 +- qa/tasks/mgr/dashboard/test_crush_rule.py | 2 +- qa/tasks/mgr/dashboard/test_erasure_code_profile.py | 2 +- qa/tasks/mgr/dashboard/test_ganesha.py | 1 - qa/tasks/mgr/dashboard/test_mgr_module.py | 3 ++- qa/tasks/mgr/dashboard/test_orchestrator.py | 2 +- qa/tasks/mgr/dashboard/test_osd.py | 2 +- qa/tasks/mgr/dashboard/test_rbd.py | 2 +- qa/tasks/mgr/dashboard/test_rgw.py | 5 ++--- qa/tasks/mgr/dashboard/test_settings.py | 2 +- qa/tasks/mgr/dashboard/test_user.py | 1 - src/pybind/mgr/dashboard/tox.ini | 2 ++ 14 files changed, 16 insertions(+), 18 deletions(-) diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py index 9176b18cf36d5..735e25592c74a 100644 --- a/qa/tasks/mgr/dashboard/helper.py +++ b/qa/tasks/mgr/dashboard/helper.py @@ -4,14 +4,12 @@ from __future__ import absolute_import import json import logging -from collections import namedtuple import time +from collections import namedtuple import requests -from teuthology.exceptions import CommandFailedError - from tasks.mgr.mgr_test_case import MgrTestCase - +from teuthology.exceptions import CommandFailedError log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_auth.py b/qa/tasks/mgr/dashboard/test_auth.py index 12ff14304db68..45d2900f1e514 100644 --- a/qa/tasks/mgr/dashboard/test_auth.py +++ b/qa/tasks/mgr/dashboard/test_auth.py @@ -6,7 +6,7 @@ import time import jwt -from .helper import DashboardTestCase, JObj, JLeaf +from .helper import DashboardTestCase, JLeaf, JObj class AuthTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_cephfs.py b/qa/tasks/mgr/dashboard/test_cephfs.py index a4c5284d7fdc5..aec658248d5d7 100644 --- a/qa/tasks/mgr/dashboard/test_cephfs.py +++ b/qa/tasks/mgr/dashboard/test_cephfs.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from contextlib import contextmanager -from .helper import DashboardTestCase, JObj, JList, JLeaf +from .helper import DashboardTestCase, JLeaf, JList, JObj class CephfsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_crush_rule.py b/qa/tasks/mgr/dashboard/test_crush_rule.py index c39983239875d..30ce834a5b780 100644 --- a/qa/tasks/mgr/dashboard/test_crush_rule.py +++ b/qa/tasks/mgr/dashboard/test_crush_rule.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase, JObj, JList +from .helper import DashboardTestCase, JList, JObj class CrushRuleTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_erasure_code_profile.py b/qa/tasks/mgr/dashboard/test_erasure_code_profile.py index ecc4958da0a6f..7fb7c1c8270fa 100644 --- a/qa/tasks/mgr/dashboard/test_erasure_code_profile.py +++ b/qa/tasks/mgr/dashboard/test_erasure_code_profile.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase, JObj, JList +from .helper import DashboardTestCase, JList, JObj class ECPTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_ganesha.py b/qa/tasks/mgr/dashboard/test_ganesha.py index 6ed803406f865..324e4af7a767d 100644 --- a/qa/tasks/mgr/dashboard/test_ganesha.py +++ b/qa/tasks/mgr/dashboard/test_ganesha.py @@ -3,7 +3,6 @@ from __future__ import absolute_import - from .helper import DashboardTestCase, JList, JObj diff --git a/qa/tasks/mgr/dashboard/test_mgr_module.py b/qa/tasks/mgr/dashboard/test_mgr_module.py index 266ab2d343f5a..756d3c848c21a 100644 --- a/qa/tasks/mgr/dashboard/test_mgr_module.py +++ b/qa/tasks/mgr/dashboard/test_mgr_module.py @@ -2,9 +2,10 @@ from __future__ import absolute_import import logging + import requests -from .helper import DashboardTestCase, JAny, JObj, JList, JLeaf +from .helper import DashboardTestCase, JAny, JLeaf, JList, JObj logger = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_orchestrator.py b/qa/tasks/mgr/dashboard/test_orchestrator.py index 596b2556afadd..c8ef35e4be5ba 100644 --- a/qa/tasks/mgr/dashboard/test_orchestrator.py +++ b/qa/tasks/mgr/dashboard/test_orchestrator.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + import json from .helper import DashboardTestCase - test_data = { 'inventory': [ { diff --git a/qa/tasks/mgr/dashboard/test_osd.py b/qa/tasks/mgr/dashboard/test_osd.py index 5ea8b043508d5..3fca66e864292 100644 --- a/qa/tasks/mgr/dashboard/test_osd.py +++ b/qa/tasks/mgr/dashboard/test_osd.py @@ -4,7 +4,7 @@ from __future__ import absolute_import import json -from .helper import DashboardTestCase, JObj, JAny, JList, JLeaf, JTuple +from .helper import DashboardTestCase, JAny, JLeaf, JList, JObj, JTuple class OsdTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_rbd.py b/qa/tasks/mgr/dashboard/test_rbd.py index 62db5440a1f2e..3fcad34ad5569 100644 --- a/qa/tasks/mgr/dashboard/test_rbd.py +++ b/qa/tasks/mgr/dashboard/test_rbd.py @@ -5,7 +5,7 @@ from __future__ import absolute_import import time -from .helper import DashboardTestCase, JObj, JLeaf, JList +from .helper import DashboardTestCase, JLeaf, JList, JObj class RbdTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_rgw.py b/qa/tasks/mgr/dashboard/test_rgw.py index 8b4fe2a6755d8..6639e88a33ba6 100644 --- a/qa/tasks/mgr/dashboard/test_rgw.py +++ b/qa/tasks/mgr/dashboard/test_rgw.py @@ -4,14 +4,13 @@ from __future__ import absolute_import import base64 import logging import time - from urllib import parse from cryptography.hazmat.backends import default_backend -from cryptography.hazmat.primitives.twofactor.totp import TOTP from cryptography.hazmat.primitives.hashes import SHA1 +from cryptography.hazmat.primitives.twofactor.totp import TOTP -from .helper import DashboardTestCase, JObj, JList, JLeaf +from .helper import DashboardTestCase, JLeaf, JList, JObj logger = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/dashboard/test_settings.py b/qa/tasks/mgr/dashboard/test_settings.py index 2d890484a3e04..46750292e1c94 100644 --- a/qa/tasks/mgr/dashboard/test_settings.py +++ b/qa/tasks/mgr/dashboard/test_settings.py @@ -2,7 +2,7 @@ from __future__ import absolute_import -from .helper import DashboardTestCase, JList, JObj, JAny +from .helper import DashboardTestCase, JAny, JList, JObj class SettingsTest(DashboardTestCase): diff --git a/qa/tasks/mgr/dashboard/test_user.py b/qa/tasks/mgr/dashboard/test_user.py index a330a4aa8b8b9..c380f477325fa 100644 --- a/qa/tasks/mgr/dashboard/test_user.py +++ b/qa/tasks/mgr/dashboard/test_user.py @@ -3,7 +3,6 @@ from __future__ import absolute_import import time - from datetime import datetime, timedelta from .helper import DashboardTestCase diff --git a/src/pybind/mgr/dashboard/tox.ini b/src/pybind/mgr/dashboard/tox.ini index 4707d567aa9c1..c22c8d88930b0 100644 --- a/src/pybind/mgr/dashboard/tox.ini +++ b/src/pybind/mgr/dashboard/tox.ini @@ -107,6 +107,7 @@ commands = flake8 flake8 --config=tox.ini ../../../../qa/tasks/mgr/dashboard isort . --check + isort ../../../../qa/tasks/mgr/dashboard --check {[base-pylint]commands} {[base-rst]commands} @@ -148,6 +149,7 @@ commands = python --version autopep8 {[autopep8]addopts} {posargs:.} isort . + isort ../../../../qa/tasks/mgr/dashboard [testenv:check] commands = -- 2.39.5