Make "utils" import more definite

MVrachev · MVrachev · commit d8d68e7cd85c · 2020-11-19T15:09:36.000+02:00
Currently, we are importing the "utils" module in tests/utils
with "import utils".
This could become a problem when there is another module with
the same general name "utils" and could lead to import mistakes.

Signed-off-by: Martin Vrachev &lt;mvrachev@vmware.com&gt;
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -17,7 +17,7 @@
 from datetime import datetime, timedelta
 from dateutil.relativedelta import relativedelta
 
-import utils
+from tests import utils
 
 # TODO: Remove case handling when fully dropping support for versions >= 3.6
 IS_PY_VERSION_SUPPORTED = sys.version_info >= (3, 6)
diff --git a/tests/test_arbitrary_package_attack.py b/tests/test_arbitrary_package_attack.py
@@ -52,7 +52,7 @@
 import tuf.client.updater as updater
 import tuf.unittest_toolbox as unittest_toolbox
 
-import utils
+import tests.utils as utils
 
 import securesystemslib
 import six
diff --git a/tests/test_developer_tool.py b/tests/test_developer_tool.py
@@ -41,7 +41,7 @@
 from tuf.developer_tool import METADATA_DIRECTORY_NAME
 from tuf.developer_tool import TARGETS_DIRECTORY_NAME
 
-import utils
+from tests import utils
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_download.py b/tests/test_download.py
@@ -47,7 +47,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.exceptions
 
-import utils
+from tests import utils
 
 import requests.exceptions
 
diff --git a/tests/test_endless_data_attack.py b/tests/test_endless_data_attack.py
@@ -54,7 +54,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.roledb
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_extraneous_dependencies_attack.py b/tests/test_extraneous_dependencies_attack.py
@@ -57,7 +57,7 @@
 import tuf.keydb
 import tuf.unittest_toolbox as unittest_toolbox
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_formats.py b/tests/test_formats.py
@@ -36,7 +36,7 @@
 import tuf
 import tuf.formats
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.util
diff --git a/tests/test_indefinite_freeze_attack.py b/tests/test_indefinite_freeze_attack.py
@@ -68,7 +68,7 @@
 import tuf.keydb
 import tuf.exceptions
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_key_revocation_integration.py b/tests/test_key_revocation_integration.py
@@ -52,7 +52,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.client.updater as updater
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_keydb.py b/tests/test_keydb.py
@@ -39,7 +39,7 @@
 import tuf.keydb
 import tuf.log
 
-import utils
+from tests import utils
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_log.py b/tests/test_log.py
@@ -33,7 +33,7 @@
 import securesystemslib
 import securesystemslib.util
 
-import utils
+from tests import utils
 
 from six.moves import reload_module
 
diff --git a/tests/test_mirrors.py b/tests/test_mirrors.py
@@ -34,7 +34,7 @@
 import tuf.mirrors as mirrors
 import tuf.unittest_toolbox as unittest_toolbox
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.util
diff --git a/tests/test_mix_and_match_attack.py b/tests/test_mix_and_match_attack.py
@@ -53,7 +53,7 @@
 import tuf.roledb
 import tuf.keydb
 
-import utils
+from tests import utils
 
 import six
 
diff --git a/tests/test_multiple_repositories_integration.py b/tests/test_multiple_repositories_integration.py
@@ -46,7 +46,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.repository_tool as repo_tool
 
-import utils
+from tests import utils
 
 import six
 import securesystemslib
diff --git a/tests/test_proxy_use.py b/tests/test_proxy_use.py
@@ -46,7 +46,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.exceptions
 
-import utils
+from tests import utils
 
 import six
 
diff --git a/tests/test_replay_attack.py b/tests/test_replay_attack.py
@@ -52,7 +52,7 @@
 import tuf.repository_tool as repo_tool
 import tuf.unittest_toolbox as unittest_toolbox
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_repository_lib.py b/tests/test_repository_lib.py
@@ -50,7 +50,7 @@
 import tuf.repository_lib as repo_lib
 import tuf.repository_tool as repo_tool
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.exceptions
diff --git a/tests/test_repository_tool.py b/tests/test_repository_tool.py
@@ -44,7 +44,7 @@
 import tuf.keydb
 import tuf.repository_tool as repo_tool
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.exceptions
diff --git a/tests/test_roledb.py b/tests/test_roledb.py
@@ -38,7 +38,7 @@
 import tuf.exceptions
 import tuf.log
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.keys
diff --git a/tests/test_root_versioning_integration.py b/tests/test_root_versioning_integration.py
@@ -40,7 +40,7 @@
 import tuf.keydb
 import tuf.repository_tool as repo_tool
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.storage
diff --git a/tests/test_sig.py b/tests/test_sig.py
@@ -42,7 +42,7 @@
 import tuf.sig
 import tuf.exceptions
 
-import utils
+from tests import utils
 
 import securesystemslib
 import securesystemslib.keys
diff --git a/tests/test_slow_retrieval_attack.py b/tests/test_slow_retrieval_attack.py
@@ -60,7 +60,7 @@
 import tuf.roledb
 import tuf.keydb
 
-import utils
+from tests import utils
 
 import six
 
diff --git a/tests/test_tutorial.py b/tests/test_tutorial.py
@@ -44,7 +44,7 @@
 
 from tuf.repository_tool import *   # part of TUTORIAL.md
 
-import utils
+from tests import utils
 
 import securesystemslib.exceptions
 
diff --git a/tests/test_unittest_toolbox.py b/tests/test_unittest_toolbox.py
@@ -35,7 +35,7 @@
 
 import tuf.unittest_toolbox as unittest_toolbox
 
-import utils
+from tests import utils
 
 logger = logging.getLogger(__name__)
 
diff --git a/tests/test_updater.py b/tests/test_updater.py
@@ -70,7 +70,7 @@
 import tuf.unittest_toolbox as unittest_toolbox
 import tuf.client.updater as updater
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
diff --git a/tests/test_updater_root_rotation_integration.py b/tests/test_updater_root_rotation_integration.py
@@ -59,7 +59,7 @@
 import tuf.client.updater as updater
 import tuf.settings
 
-import utils
+from tests import utils
 
 import securesystemslib
 import six
