Fix circular imports in tests

salt/loader/__init__.py

@@ -20,7 +20,6 @@ import salt.syspaths
 import salt.utils.context
 import salt.utils.data
 import salt.utils.dictupdate
-import salt.utils.event
 import salt.utils.files
 import salt.utils.lazy
 import salt.utils.odict
@@ -358,6 +357,8 @@ def minion_mods(
                         ret[f_key] = funcs[func]
 
     if notify:
+        import salt.utils.event
+
         with salt.utils.event.get_event("minion", opts=opts, listen=False) as evt:
             evt.fire_event(
                 {"complete": True}, tag=salt.defaults.events.MINION_MOD_REFRESH_COMPLETE

salt/loader/dunder.py

@@ -6,4 +6,4 @@ import salt.loader.context
 loader_context = salt.loader.context.LoaderContext()
 
 
-__file_client__ = loader_context.named_context("__file_client__")
+__file_client__ = loader_context.named_context("__file_client__", default=None)

salt/payload.py

@@ -9,7 +9,6 @@ import datetime
 import gc
 import logging
 
-import salt.loader.context
 import salt.transport.frame
 import salt.utils.immutabletypes as immutabletypes
 import salt.utils.msgpack

salt/utils/crypt.py

@@ -5,7 +5,6 @@ import hashlib
 import logging
 import os
 
-import salt.loader
 import salt.utils.files
 from salt.exceptions import SaltInvocationError
 
@@ -104,6 +103,10 @@ def decrypt(
     if renderers is None:
         if opts is None:
             raise TypeError("opts are required")
+
+        # Avaoid circular import
+        import salt.loader
+
         renderers = salt.loader.render(opts, {})
 
     rend_func = renderers.get(rend)

tests/pytests/functional/test_fileclient_reuse.py

@@ -4,6 +4,7 @@ import salt.loader
 import salt.pillar
 import salt.state
 import salt.utils.cache
+import salt.utils.jinja
 from tests.support.mock import patch