Skip to content

Commit 436f2b1

Browse files
committed
Fix tests
1 parent 68ed84e commit 436f2b1

1 file changed

Lines changed: 7 additions & 83 deletions

File tree

tests/mirage/mirage_node_test.py

Lines changed: 7 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -156,15 +156,15 @@ def test_cleanup_success(
156156
resource_alloc,
157157
meta_file_v3,
158158
):
159-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': 'test_chain'}
159+
mock_env = {'ENV_TYPE': 'devnet'}
160160
mock_compose_env.return_value = mock_env
161161

162162
cleanup()
163163

164164
mock_compose_env.assert_called_once_with(
165165
SKALE_DIR_ENV_FILEPATH, save=False, node_type=NodeType.MIRAGE
166166
)
167-
mock_cleanup_mirage_op.assert_called_once_with(mock_env, 'test_chain')
167+
mock_cleanup_mirage_op.assert_called_once_with(mock_env)
168168
mock_cleanup_docker_config.assert_called_once()
169169

170170

@@ -183,55 +183,24 @@ def test_cleanup_calls_operations_in_correct_order(
183183
):
184184
from node_cli.mirage.mirage_node import cleanup
185185

186-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': 'test_chain'}
186+
mock_env = {'ENV_TYPE': 'devnet'}
187187
mock_compose_env.return_value = mock_env
188188

189-
# Create a mock manager to track call order
190189
manager = mock.Mock()
191190
manager.attach_mock(mock_compose_env, 'compose_env')
192191
manager.attach_mock(mock_cleanup_mirage_op, 'cleanup_mirage_op')
193192
manager.attach_mock(mock_cleanup_docker_config, 'cleanup_docker_config')
194193

195194
cleanup()
196195

197-
# Verify the order of calls
198196
expected_calls = [
199197
mock.call.compose_env(mock.ANY, save=False, node_type=mock.ANY),
200-
mock.call.cleanup_mirage_op(mock_env, 'test_chain'),
198+
mock.call.cleanup_mirage_op(mock_env),
201199
mock.call.cleanup_docker_config(),
202200
]
203201
manager.assert_has_calls(expected_calls, any_order=False)
204202

205203

206-
@mock.patch('node_cli.utils.decorators.is_user_valid', return_value=True)
207-
@mock.patch('node_cli.mirage.mirage_node.cleanup_docker_configuration')
208-
@mock.patch('node_cli.mirage.mirage_node.cleanup_mirage_op')
209-
@mock.patch('node_cli.mirage.mirage_node.compose_node_env')
210-
def test_cleanup_with_different_chain_names(
211-
mock_compose_env,
212-
mock_cleanup_mirage_op,
213-
mock_cleanup_docker_config,
214-
mock_is_user_valid,
215-
inited_node,
216-
resource_alloc,
217-
meta_file_v3,
218-
):
219-
test_cases = [
220-
'simple_chain',
221-
'chain-with-hyphens',
222-
'chain_with_underscores',
223-
'ChainWithMixedCase',
224-
]
225-
226-
for chain_name in test_cases:
227-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': chain_name}
228-
mock_compose_env.return_value = mock_env
229-
230-
cleanup()
231-
232-
mock_cleanup_mirage_op.assert_called_with(mock_env, chain_name)
233-
234-
235204
@mock.patch('node_cli.utils.decorators.is_user_valid', return_value=True)
236205
@mock.patch('node_cli.mirage.mirage_node.cleanup_docker_configuration')
237206
@mock.patch(
@@ -247,17 +216,14 @@ def test_cleanup_continues_after_mirage_op_error(
247216
resource_alloc,
248217
meta_file_v3,
249218
):
250-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': 'test_chain'}
219+
mock_env = {'ENV_TYPE': 'devnet'}
251220
mock_compose_env.return_value = mock_env
252221

253-
# The function should raise the exception from cleanup_mirage_op
254222
with pytest.raises(Exception, match='Cleanup failed'):
255223
cleanup()
256224

257-
# But we should still verify the calls were made in order
258225
mock_compose_env.assert_called_once()
259-
mock_cleanup_mirage_op.assert_called_once_with(mock_env, 'test_chain')
260-
# cleanup_docker_configuration should not be called if cleanup_mirage_op fails
226+
mock_cleanup_mirage_op.assert_called_once_with(mock_env)
261227
mock_cleanup_docker_config.assert_not_called()
262228

263229

@@ -299,53 +265,11 @@ def test_cleanup_logs_success_message(
299265
resource_alloc,
300266
meta_file_v3,
301267
):
302-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': 'test_chain'}
268+
mock_env = {'ENV_TYPE': 'devnet'}
303269
mock_compose_env.return_value = mock_env
304270

305271
cleanup()
306272

307273
mock_logger.info.assert_called_once_with(
308274
'Mirage node was cleaned up, all containers and data removed'
309275
)
310-
311-
312-
@mock.patch('node_cli.utils.decorators.is_user_valid', return_value=True)
313-
@mock.patch('node_cli.mirage.mirage_node.cleanup_docker_configuration')
314-
@mock.patch('node_cli.mirage.mirage_node.cleanup_mirage_op')
315-
@mock.patch('node_cli.mirage.mirage_node.compose_node_env')
316-
def test_cleanup_with_missing_schain_name(
317-
mock_compose_env,
318-
mock_cleanup_mirage_op,
319-
mock_cleanup_docker_config,
320-
mock_is_user_valid,
321-
inited_node,
322-
resource_alloc,
323-
meta_file_v3,
324-
):
325-
mock_env = {'ENV_TYPE': 'devnet'} # Missing SCHAIN_NAME
326-
mock_compose_env.return_value = mock_env
327-
328-
with pytest.raises(KeyError):
329-
cleanup()
330-
331-
332-
@mock.patch('node_cli.utils.decorators.is_user_valid', return_value=True)
333-
@mock.patch('node_cli.mirage.mirage_node.cleanup_docker_configuration')
334-
@mock.patch('node_cli.mirage.mirage_node.cleanup_mirage_op')
335-
@mock.patch('node_cli.mirage.mirage_node.compose_node_env')
336-
def test_cleanup_with_empty_schain_name(
337-
mock_compose_env,
338-
mock_cleanup_mirage_op,
339-
mock_cleanup_docker_config,
340-
mock_is_user_valid,
341-
inited_node,
342-
resource_alloc,
343-
meta_file_v3,
344-
):
345-
mock_env = {'ENV_TYPE': 'devnet', 'SCHAIN_NAME': ''}
346-
mock_compose_env.return_value = mock_env
347-
348-
cleanup()
349-
350-
mock_cleanup_mirage_op.assert_called_once_with(mock_env, '')
351-
mock_cleanup_docker_config.assert_called_once()

0 commit comments

Comments
 (0)