@@ -28,9 +28,7 @@ def test_restore_fair(
2828
2929 restore (backup_path , valid_env_file )
3030
31- mock_compose_env .assert_called_once_with (
32- node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE
33- )
31+ mock_compose_env .assert_called_once_with (node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE )
3432 mock_restore_op .assert_called_once_with (
3533 node_mode = NodeMode .ACTIVE ,
3634 settings = mock .ANY ,
@@ -58,9 +56,7 @@ def test_init_fair_boot(
5856
5957 init_boot (valid_env_file )
6058
61- mock_compose_env .assert_called_once_with (
62- node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE
63- )
59+ mock_compose_env .assert_called_once_with (node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE )
6460 mock_init_op .assert_called_once_with (
6561 settings = mock .ANY ,
6662 compose_env = mock_env ,
@@ -95,9 +91,7 @@ def test_update_fair_boot(
9591
9692 update (valid_env_file , pull_config_for_schain )
9793
98- mock_compose_env .assert_called_once_with (
99- node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE
100- )
94+ mock_compose_env .assert_called_once_with (node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE )
10195 mock_update_op .assert_called_once_with (
10296 settings = mock .ANY ,
10397 compose_env = mock_env ,
@@ -127,9 +121,7 @@ def test_migrate_from_boot(
127121
128122 migrate_from_boot (valid_env_file )
129123
130- mock_compose_env .assert_called_once_with (
131- node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE
132- )
124+ mock_compose_env .assert_called_once_with (node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE )
133125 mock_migrate_op .assert_called_once_with (
134126 settings = mock .ANY ,
135127 compose_env = mock_env ,
@@ -146,19 +138,17 @@ def test_cleanup_success(
146138 mock_compose_env ,
147139 mock_cleanup_fair_op ,
148140 mock_is_user_valid ,
149- inited_node ,
150141 resource_alloc ,
151142 meta_file_v3 ,
152143 active_node_option ,
144+ inited_node ,
153145):
154146 mock_env = {'ENV_TYPE' : 'devnet' }
155147 mock_compose_env .return_value = mock_env
156148
157149 cleanup (node_mode = NodeMode .ACTIVE )
158150
159- mock_compose_env .assert_called_once_with (
160- node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE
161- )
151+ mock_compose_env .assert_called_once_with (node_type = NodeType .FAIR , node_mode = NodeMode .ACTIVE )
162152 mock_cleanup_fair_op .assert_called_once_with (
163153 node_mode = NodeMode .ACTIVE , compose_env = mock_env , prune = False
164154 )
@@ -171,10 +161,10 @@ def test_cleanup_calls_operations_in_correct_order(
171161 mock_compose_env ,
172162 mock_cleanup_fair_op ,
173163 mock_is_user_valid ,
174- inited_node ,
175164 resource_alloc ,
176165 meta_file_v3 ,
177166 active_node_option ,
167+ inited_node ,
178168):
179169 from node_cli .fair .common import cleanup
180170
@@ -204,10 +194,10 @@ def test_cleanup_continues_after_fair_op_error(
204194 mock_compose_env ,
205195 mock_cleanup_fair_op ,
206196 mock_is_user_valid ,
207- inited_node ,
208197 resource_alloc ,
209198 meta_file_v3 ,
210199 active_node_option ,
200+ inited_node ,
211201):
212202 mock_env = {'ENV_TYPE' : 'devnet' }
213203 mock_compose_env .return_value = mock_env
@@ -224,9 +214,9 @@ def test_cleanup_continues_after_fair_op_error(
224214@mock .patch ('node_cli.utils.decorators.is_user_valid' , return_value = False )
225215def test_cleanup_fails_when_user_invalid (
226216 mock_is_user_valid ,
227- inited_node ,
228217 resource_alloc ,
229218 meta_file_v3 ,
219+ inited_node ,
230220):
231221 """Test that cleanup fails when user validation fails"""
232222 import pytest
@@ -253,10 +243,10 @@ def test_cleanup_logs_success_message(
253243 mock_compose_env ,
254244 mock_cleanup_fair_op ,
255245 mock_is_user_valid ,
256- inited_node ,
257246 resource_alloc ,
258247 meta_file_v3 ,
259248 active_node_option ,
249+ inited_node ,
260250):
261251 mock_env = {'ENV_TYPE' : 'devnet' }
262252 mock_compose_env .return_value = mock_env
0 commit comments