From: Kefu Chai Date: Fri, 27 Mar 2020 05:57:37 +0000 (+0800) Subject: qa/tasks/mgr: use relative import X-Git-Tag: v14.2.10~17^2~38 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=acfb464f949155b19d9850363e258711ae81b8ce;p=ceph.git 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) --- diff --git a/qa/tasks/mgr/test_crash.py b/qa/tasks/mgr/test_crash.py index 6607bec7d736..cb5c7af76fad 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 44b6602a6da3..5e9b3829b2a6 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 2437d13b7012..5e1d842d52f7 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 a9d9e3d9fd2e..22e3abfcfe3a 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 bec2786c33d3..8d6a8e947975 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 9da83a6f9ca2..50416f1dff2b 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 13c1ca46f0c7..35039f2d0c30 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 9948df19c031..e8292b4a2b26 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__)