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 <tdehler@suse.com>

diff --git a/qa/tasks/mgr/dashboard/helper.py b/qa/tasks/mgr/dashboard/helper.py
index 9176b18cf36d536238ee312be9b26270f9411bc1..735e25592c74a48b59b9452e0c23c385b257d067 100644 (file)
--- 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 12ff14304db683e689ecbd173ae2a77988bc3957..45d2900f1e514b3eba7f344e489d255149a61bb6 100644 (file)
--- 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 a4c5284d7fdc5654e81c92f403018dd948f082e2..aec658248d5d72ec414fcab1fce5fa2abbbee91b 100644 (file)
--- 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 c39983239875d4184bc52fad05f11d7dfa969e4d..30ce834a5b780fbcdf06b644789b358f4173cb35 100644 (file)
--- 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 ecc4958da0a6f80fc0935f154087749c9f2c9e51..7fb7c1c8270fa4022542898d33b661fc10e698e0 100644 (file)
--- 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 6ed803406f8659f82d8887feda5670393fdeb9cb..324e4af7a767d2941707bc4bf8ddad6ad0844e5a 100644 (file)
--- 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 266ab2d343f5a10c849309cd3e86d3de80cc53dc..756d3c848c21a96a59a70539999ec3f6d1c97ab7 100644 (file)
--- 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 596b2556afadda75d0ce2c88c79ad321a248fa73..c8ef35e4be5ba4bc6f47effd4dd38e2d397c5504 100644 (file)
--- 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 5ea8b043508d505885bb5857dfe2fb8422872f83..3fca66e8642920f24a3d5590391310ab1da23b14 100644 (file)
--- 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 62db5440a1f2ef3f062fa3d09d99338e3697f576..3fcad34ad5569ba9429c860cb96a86e59def1013 100644 (file)
--- 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 8b4fe2a6755d8d43f8571f9d79e0f305aee71d35..6639e88a33ba6de34c7be1836b459f0c69856efa 100644 (file)
--- 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 2d890484a3e04f09326a926ee18c995376709bc2..46750292e1c9447d002a9989f9731b42ff924d23 100644 (file)
--- 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 a330a4aa8b8b97b7cd6f370546ce23cfa21d9150..c380f477325fa0825bf284ef71c25b5e2be7d98a 100644 (file)
--- 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 4707d567aa9c188a0ce0124356a28398c8d502c5..c22c8d88930b0b6d50dad0e003e7154633a77f0e 100644 (file)
--- 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 =