Skip to content

Commit 34a83f5

Browse files
committed
fix passive node tests
1 parent 24ffcb0 commit 34a83f5

4 files changed

Lines changed: 3 additions & 18 deletions

File tree

node_cli/core/node.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ def cleanup(node_mode: NodeMode, prune: bool = False) -> None:
247247

248248

249249
def compose_node_env(node_type: NodeType, node_mode: NodeMode) -> dict[str, str]:
250+
st = get_settings()
250251
if node_mode == NodeMode.PASSIVE or node_type == NodeType.FAIR:
251252
mnt_dir = SCHAINS_MNT_DIR_SINGLE_CHAIN
252253
else:
@@ -256,6 +257,7 @@ def compose_node_env(node_type: NodeType, node_mode: NodeMode) -> dict[str, str]
256257
'SCHAINS_MNT_DIR': mnt_dir,
257258
'FILESTORAGE_MAPPING': FILESTORAGE_MAPPING,
258259
'SKALE_LIB_PATH': SKALE_STATE_DIR,
260+
'FILEBEAT_HOST': st.filebeat_host,
259261
}
260262
return {k: v for k, v in env.items() if v != ''}
261263

node_cli/fair/common.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ def init(
7676
print('Fair node is initialized')
7777

7878

79+
@check_inited
7980
@check_user
8081
def cleanup(node_mode: NodeMode, prune: bool = False) -> None:
8182
node_mode = upsert_node_mode(node_mode=node_mode)

tests/.skale/node_data/settings/node.toml

Lines changed: 0 additions & 17 deletions
This file was deleted.

tests/cli/passive_node_test.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ def test_init_passive_archive(mocked_g_config, clean_node_options, passive_user_
6767
mock.patch('node_cli.operations.base.prepare_host'),
6868
mock.patch('node_cli.operations.base.save_internal_settings'),
6969
mock.patch('node_cli.operations.base.run_host_checks', return_value=[]),
70-
mock.patch('node_cli.operations.base.set_passive_node_options'),
7170
mock.patch('node_cli.operations.base.ensure_filestorage_mapping'),
7271
mock.patch('node_cli.operations.base.generate_nginx_config'),
7372
mock.patch('node_cli.operations.base.get_settings'),

0 commit comments

Comments
 (0)