From acfb464f949155b19d9850363e258711ae81b8ce Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 27 Mar 2020 13:57:37 +0800 Subject: [PATCH] qa/tasks/mgr: use relative import for better readability, and to ease the pain of developer to track back to the top level python package for referencing a submodule Signed-off-by: Kefu Chai (cherry picked from commit 7d37226548a1d543bd0cdba916f3e00730a91797) --- qa/tasks/mgr/test_crash.py | 7 +++---- qa/tasks/mgr/test_dashboard.py | 6 ++---- qa/tasks/mgr/test_failover.py | 2 +- qa/tasks/mgr/test_insights.py | 3 ++- qa/tasks/mgr/test_module_selftest.py | 3 ++- qa/tasks/mgr/test_orchestrator_cli.py | 2 +- qa/tasks/mgr/test_progress.py | 2 +- qa/tasks/mgr/test_prometheus.py | 3 +-- 8 files changed, 13 insertions(+), 15 deletions(-) diff --git a/qa/tasks/mgr/test_crash.py b/qa/tasks/mgr/test_crash.py index 6607bec7d736d..cb5c7af76fad0 100644 --- a/qa/tasks/mgr/test_crash.py +++ b/qa/tasks/mgr/test_crash.py @@ -1,11 +1,10 @@ - - -from tasks.mgr.mgr_test_case import MgrTestCase - import json import logging import datetime +from .mgr_test_case import MgrTestCase + + log = logging.getLogger(__name__) UUID = 'd5775432-0742-44a3-a435-45095e32e6b1' DATEFMT = '%Y-%m-%d %H:%M:%S.%f' diff --git a/qa/tasks/mgr/test_dashboard.py b/qa/tasks/mgr/test_dashboard.py index 44b6602a6da3a..5e9b3829b2a6e 100644 --- a/qa/tasks/mgr/test_dashboard.py +++ b/qa/tasks/mgr/test_dashboard.py @@ -1,10 +1,8 @@ - - -from tasks.mgr.mgr_test_case import MgrTestCase - import logging import requests +from .mgr_test_case import MgrTestCase + log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_failover.py b/qa/tasks/mgr/test_failover.py index 2437d13b7012f..5e1d842d52f7d 100644 --- a/qa/tasks/mgr/test_failover.py +++ b/qa/tasks/mgr/test_failover.py @@ -2,7 +2,7 @@ import logging import json -from tasks.mgr.mgr_test_case import MgrTestCase +from .mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_insights.py b/qa/tasks/mgr/test_insights.py index a9d9e3d9fd2e3..22e3abfcfe3a1 100644 --- a/qa/tasks/mgr/test_insights.py +++ b/qa/tasks/mgr/test_insights.py @@ -3,7 +3,8 @@ import json import datetime import time -from tasks.mgr.mgr_test_case import MgrTestCase +from .mgr_test_case import MgrTestCase + log = logging.getLogger(__name__) UUID = 'd5775432-0742-44a3-a435-45095e32e6b2' diff --git a/qa/tasks/mgr/test_module_selftest.py b/qa/tasks/mgr/test_module_selftest.py index bec2786c33d3d..8d6a8e9479759 100644 --- a/qa/tasks/mgr/test_module_selftest.py +++ b/qa/tasks/mgr/test_module_selftest.py @@ -5,7 +5,8 @@ import errno import logging from teuthology.exceptions import CommandFailedError -from tasks.mgr.mgr_test_case import MgrTestCase +from .mgr_test_case import MgrTestCase + log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_orchestrator_cli.py b/qa/tasks/mgr/test_orchestrator_cli.py index 9da83a6f9ca2b..50416f1dff2b0 100644 --- a/qa/tasks/mgr/test_orchestrator_cli.py +++ b/qa/tasks/mgr/test_orchestrator_cli.py @@ -4,7 +4,7 @@ import logging from teuthology.exceptions import CommandFailedError -from tasks.mgr.mgr_test_case import MgrTestCase +from .mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_progress.py b/qa/tasks/mgr/test_progress.py index 13c1ca46f0c7c..35039f2d0c305 100644 --- a/qa/tasks/mgr/test_progress.py +++ b/qa/tasks/mgr/test_progress.py @@ -4,7 +4,7 @@ import logging import time from unittest import SkipTest -from tasks.mgr.mgr_test_case import MgrTestCase +from .mgr_test_case import MgrTestCase log = logging.getLogger(__name__) diff --git a/qa/tasks/mgr/test_prometheus.py b/qa/tasks/mgr/test_prometheus.py index 9948df19c031e..e8292b4a2b26a 100644 --- a/qa/tasks/mgr/test_prometheus.py +++ b/qa/tasks/mgr/test_prometheus.py @@ -1,9 +1,8 @@ -from tasks.mgr.mgr_test_case import MgrTestCase - import json import logging import requests +from .mgr_test_case import MgrTestCase log = logging.getLogger(__name__) -- 2.39.5