Fix tests

Author: badrogger

tests/conftest.py

@@ -19,9 +19,9 @@
 
 import json
 import os
-import tempfile
 import pathlib
 import shutil
+import tempfile
 from contextlib import contextmanager
 
 import docker
@@ -34,18 +34,17 @@
     GLOBAL_SKALE_CONF_FILEPATH,
     GLOBAL_SKALE_DIR,
     META_FILEPATH,
+    NGINX_CONFIG_FILEPATH,
     NGINX_CONTAINER_NAME,
+    REDIS_URI,
     REMOVED_CONTAINERS_FOLDER_PATH,
     SCHAIN_NODE_DATA_PATH,
-    NGINX_CONFIG_FILEPATH,
-    REDIS_URI,
 )
 from node_cli.configs.node_options import NODE_OPTIONS_FILEPATH
-from node_cli.configs.ssl import SSL_FOLDER_PATH
 from node_cli.configs.resource_allocation import RESOURCE_ALLOCATION_FILEPATH
+from node_cli.configs.ssl import SSL_FOLDER_PATH
 from node_cli.utils.docker_utils import docker_client
 from node_cli.utils.global_config import generate_g_config_file
-
 from tests.helper import TEST_META_V1, TEST_META_V2, TEST_META_V3, TEST_SCHAINS_MNT_DIR_SINGLE_CHAIN
 
 
@@ -385,8 +384,9 @@ def sync_user_conf(tmp_path):
         yield test_env_path
     finally:
         test_env_path.unlink()
-        
-        
+
+
+@pytest.fixture
 def redis_client():
     cpool = redis.ConnectionPool.from_url(REDIS_URI)
     return redis.Redis(connection_pool=cpool)

tests/mirage/mirage_node_test.py

@@ -100,8 +100,8 @@ def test_update_mirage_boot(
     mock_is_alive.assert_called_once_with(node_type=NodeType.MIRAGE, is_mirage_boot=True)
 
 
-@mock.patch('node_cli.core.mirage_node.update_mirage_op')
-@mock.patch('node_cli.core.mirage_node.compose_node_env')
+@mock.patch('node_cli.mirage.mirage_node.update_mirage_op')
+@mock.patch('node_cli.mirage.mirage_node.compose_node_env')
 @mock.patch('node_cli.utils.decorators.is_user_valid', return_value=True)
 def test_migrate_from_boot(
     mock_is_user_valid,
@@ -125,7 +125,7 @@ def test_migrate_from_boot(
         node_type=NodeType.MIRAGE,
     )
     mock_migrate_op.assert_called_once_with(
-        valid_env_file, mock_env, update_type=MirageUpdateType.INFRA_ONLY
+        valid_env_file, mock_env, update_type=MirageUpdateType.FROM_BOOT
     )