@@ -37,15 +37,6 @@ def teardown_autoscaling_coordinator():
3737 kill_autoscaling_coordinator ()
3838
3939
40- MOCKED_TIME = 0
41-
42-
43- def mock_time ():
44- global MOCKED_TIME
45-
46- return MOCKED_TIME
47-
48-
4940CLUSTER_NODES_WITH_HEAD = [
5041 # Head node should be included if it has non-zero CPUs or GPUs.
5142 {
@@ -94,12 +85,11 @@ def mock_time():
9485 ],
9586)
9687def test_basic (cluster_nodes ):
97- global MOCKED_TIME
98- MOCKED_TIME = 0
88+ mocked_time = 0
9989
10090 mock_request_resources = Mock ()
10191 as_coordinator = _AutoscalingCoordinatorActor (
102- get_current_time = mock_time ,
92+ get_current_time = lambda : mocked_time ,
10393 send_resources_request = mock_request_resources ,
10494 get_cluster_nodes = lambda : cluster_nodes ,
10595 )
@@ -162,7 +152,7 @@ def _remove_head_node_resources(res):
162152 assert res2 == req2 + [{"CPU" : 4 , "GPU" : 2 , "object_store_memory" : 600 }]
163153
164154 # After req1_timeout, req1 should be expired.
165- MOCKED_TIME = req1_timeout + 0.1
155+ mocked_time = req1_timeout + 0.1
166156 as_coordinator .tick ()
167157 mock_request_resources .assert_called_with (req2 )
168158 res1 = as_coordinator .get_allocated_resources ("requester1" )
@@ -173,7 +163,7 @@ def _remove_head_node_resources(res):
173163 assert res2 == req2 + [{"CPU" : 8 , "GPU" : 4 , "object_store_memory" : 900 }]
174164
175165 # After req2_timeout, req2 should be expired.
176- MOCKED_TIME = req2_timeout + 0.1
166+ mocked_time = req2_timeout + 0.1
177167 as_coordinator .tick ()
178168 mock_request_resources .assert_called_with ([])
179169 res1 = as_coordinator .get_allocated_resources ("requester1" )
@@ -203,9 +193,10 @@ def test_double_allocation_with_multiple_request_remaining():
203193 }
204194 ]
205195
196+ mocked_time = 0
206197 mock_request_resources = Mock ()
207198 coordinator = _AutoscalingCoordinatorActor (
208- get_current_time = mock_time ,
199+ get_current_time = lambda : mocked_time ,
209200 send_resources_request = mock_request_resources ,
210201 get_cluster_nodes = lambda : cluster_nodes ,
211202 )
0 commit comments