Skip to content

Commit 7a5de8f

Browse files
r4victorr4victor
committed
Fix tests
1 parent 9d64349 commit 7a5de8f

6 files changed

Lines changed: 41 additions & 55 deletions

File tree

‎src/tests/_internal/server/background/tasks/test_process_instances.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -729,7 +729,7 @@ async def test_creates_instance(
729729
availability=InstanceAvailability.AVAILABLE,
730730
)
731731
backend_mock.compute.return_value = Mock(spec=ComputeMockSpec)
732-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
732+
backend_mock.compute.return_value.get_offers.return_value = [offer]
733733
backend_mock.compute.return_value.create_instance.return_value = JobProvisioningData(
734734
backend=offer.backend,
735735
instance_type=offer.instance,
@@ -762,13 +762,13 @@ async def test_tries_second_offer_if_first_fails(self, session: AsyncSession, er
762762
aws_mock.TYPE = BackendType.AWS
763763
offer = get_instance_offer_with_availability(backend=BackendType.AWS, price=1.0)
764764
aws_mock.compute.return_value = Mock(spec=ComputeMockSpec)
765-
aws_mock.compute.return_value.get_offers_cached.return_value = [offer]
765+
aws_mock.compute.return_value.get_offers.return_value = [offer]
766766
aws_mock.compute.return_value.create_instance.side_effect = err
767767
gcp_mock = Mock()
768768
gcp_mock.TYPE = BackendType.GCP
769769
offer = get_instance_offer_with_availability(backend=BackendType.GCP, price=2.0)
770770
gcp_mock.compute.return_value = Mock(spec=ComputeMockSpec)
771-
gcp_mock.compute.return_value.get_offers_cached.return_value = [offer]
771+
gcp_mock.compute.return_value.get_offers.return_value = [offer]
772772
gcp_mock.compute.return_value.create_instance.return_value = get_job_provisioning_data(
773773
backend=offer.backend, region=offer.region, price=offer.price
774774
)
@@ -791,7 +791,7 @@ async def test_fails_if_all_offers_fail(self, session: AsyncSession, err: Except
791791
aws_mock.TYPE = BackendType.AWS
792792
offer = get_instance_offer_with_availability(backend=BackendType.AWS, price=1.0)
793793
aws_mock.compute.return_value = Mock(spec=ComputeMockSpec)
794-
aws_mock.compute.return_value.get_offers_cached.return_value = [offer]
794+
aws_mock.compute.return_value.get_offers.return_value = [offer]
795795
aws_mock.compute.return_value.create_instance.side_effect = err
796796
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
797797
m.return_value = [aws_mock]
@@ -903,7 +903,7 @@ async def test_create_placement_group_if_placement_cluster(
903903
backend_mock = Mock()
904904
backend_mock.TYPE = BackendType.AWS
905905
backend_mock.compute.return_value = Mock(spec=ComputeMockSpec)
906-
backend_mock.compute.return_value.get_offers_cached.return_value = [
906+
backend_mock.compute.return_value.get_offers.return_value = [
907907
get_instance_offer_with_availability()
908908
]
909909
backend_mock.compute.return_value.create_instance.return_value = (
@@ -951,7 +951,7 @@ async def test_reuses_placement_group_between_offers_if_the_group_is_suitable(
951951
backend_mock = Mock()
952952
backend_mock.TYPE = BackendType.AWS
953953
backend_mock.compute.return_value = Mock(spec=ComputeMockSpec)
954-
backend_mock.compute.return_value.get_offers_cached.return_value = [
954+
backend_mock.compute.return_value.get_offers.return_value = [
955955
get_instance_offer_with_availability(instance_type="bad-offer-1"),
956956
get_instance_offer_with_availability(instance_type="bad-offer-2"),
957957
get_instance_offer_with_availability(instance_type="good-offer"),
@@ -1010,7 +1010,7 @@ async def test_handles_create_placement_group_errors(
10101010
backend_mock = Mock()
10111011
backend_mock.TYPE = BackendType.AWS
10121012
backend_mock.compute.return_value = Mock(spec=ComputeMockSpec)
1013-
backend_mock.compute.return_value.get_offers_cached.return_value = [
1013+
backend_mock.compute.return_value.get_offers.return_value = [
10141014
get_instance_offer_with_availability(instance_type="bad-offer"),
10151015
get_instance_offer_with_availability(instance_type="good-offer"),
10161016
]

‎src/tests/_internal/server/background/tasks/test_process_submitted_jobs.py‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@ async def test_provisions_job(
125125
backend_mock = Mock()
126126
m.return_value = [backend_mock]
127127
backend_mock.TYPE = backend
128-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
128+
backend_mock.compute.return_value.get_offers.return_value = [offer]
129129
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
130130
await process_submitted_jobs()
131131
m.assert_called_once()
132-
backend_mock.compute.return_value.get_offers_cached.assert_called_once()
132+
backend_mock.compute.return_value.get_offers.assert_called_once()
133133
backend_mock.compute.return_value.run_job.assert_called_once()
134134

135135
await session.refresh(job)
@@ -172,13 +172,13 @@ async def test_fails_job_when_privileged_true_and_no_offers_with_create_instance
172172
backend_mock = Mock()
173173
m.return_value = [backend_mock]
174174
backend_mock.TYPE = BackendType.RUNPOD
175-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
175+
backend_mock.compute.return_value.get_offers.return_value = [offer]
176176
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
177177
with patch("dstack._internal.utils.common.get_current_datetime") as datetime_mock:
178178
datetime_mock.return_value = datetime(2023, 1, 2, 3, 30, 0, tzinfo=timezone.utc)
179179
await process_submitted_jobs()
180180
m.assert_called_once()
181-
backend_mock.compute.return_value.get_offers_cached.assert_not_called()
181+
backend_mock.compute.return_value.get_offers.assert_not_called()
182182
backend_mock.compute.return_value.run_job.assert_not_called()
183183

184184
await session.refresh(job)
@@ -222,13 +222,13 @@ async def test_fails_job_when_instance_mounts_and_no_offers_with_create_instance
222222
backend_mock = Mock()
223223
m.return_value = [backend_mock]
224224
backend_mock.TYPE = BackendType.RUNPOD
225-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
225+
backend_mock.compute.return_value.get_offers.return_value = [offer]
226226
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
227227
with patch("dstack._internal.utils.common.get_current_datetime") as datetime_mock:
228228
datetime_mock.return_value = datetime(2023, 1, 2, 3, 30, 0, tzinfo=timezone.utc)
229229
await process_submitted_jobs()
230230
m.assert_called_once()
231-
backend_mock.compute.return_value.get_offers_cached.assert_not_called()
231+
backend_mock.compute.return_value.get_offers.assert_not_called()
232232
backend_mock.compute.return_value.run_job.assert_not_called()
233233

234234
await session.refresh(job)
@@ -274,7 +274,7 @@ async def test_provisions_job_with_optional_instance_volume_not_attached(
274274
backend_mock = Mock()
275275
m.return_value = [backend_mock]
276276
backend_mock.TYPE = BackendType.RUNPOD
277-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
277+
backend_mock.compute.return_value.get_offers.return_value = [offer]
278278
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
279279
await process_submitted_jobs()
280280

@@ -693,11 +693,11 @@ async def test_creates_new_instance_in_existing_non_empty_fleet(
693693
backend_mock = Mock()
694694
m.return_value = [backend_mock]
695695
backend_mock.TYPE = BackendType.AWS
696-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
696+
backend_mock.compute.return_value.get_offers.return_value = [offer]
697697
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
698698
await process_submitted_jobs()
699699
m.assert_called_once()
700-
backend_mock.compute.return_value.get_offers_cached.assert_called_once()
700+
backend_mock.compute.return_value.get_offers.assert_called_once()
701701
backend_mock.compute.return_value.run_job.assert_called_once()
702702

703703
await session.refresh(job)
@@ -884,11 +884,11 @@ async def test_creates_new_instance_in_existing_empty_fleet(
884884
backend_mock = Mock()
885885
m.return_value = [backend_mock]
886886
backend_mock.TYPE = BackendType.AWS
887-
backend_mock.compute.return_value.get_offers_cached.return_value = [offer]
887+
backend_mock.compute.return_value.get_offers.return_value = [offer]
888888
backend_mock.compute.return_value.run_job.return_value = get_job_provisioning_data()
889889
await process_submitted_jobs()
890890
m.assert_called_once()
891-
backend_mock.compute.return_value.get_offers_cached.assert_called_once()
891+
backend_mock.compute.return_value.get_offers.assert_called_once()
892892
backend_mock.compute.return_value.run_job.assert_called_once()
893893

894894
await session.refresh(job)

‎src/tests/_internal/server/routers/test_fleets.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,13 +1065,13 @@ async def test_returns_create_plan_for_new_fleet(
10651065
backend_mock = Mock()
10661066
m.return_value = [backend_mock]
10671067
backend_mock.TYPE = BackendType.AWS
1068-
backend_mock.compute.return_value.get_offers_cached.return_value = offers
1068+
backend_mock.compute.return_value.get_offers.return_value = offers
10691069
response = await client.post(
10701070
f"/api/project/{project.name}/fleets/get_plan",
10711071
headers=get_auth_headers(user.token),
10721072
json={"spec": spec.dict()},
10731073
)
1074-
backend_mock.compute.return_value.get_offers_cached.assert_called_once()
1074+
backend_mock.compute.return_value.get_offers.assert_called_once()
10751075

10761076
assert response.status_code == 200
10771077
assert response.json() == {

‎src/tests/_internal/server/routers/test_gpus.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def create_mock_backends_with_offers(
8484
for backend_type, offers in offers_by_backend.items():
8585
backend_mock = Mock()
8686
backend_mock.TYPE = backend_type
87-
backend_mock.compute.return_value.get_offers_cached.return_value = offers
87+
backend_mock.compute.return_value.get_offers.return_value = offers
8888
mocked_backends.append(backend_mock)
8989

9090
return mocked_backends
@@ -161,7 +161,7 @@ async def test_returns_empty_gpus_when_no_offers(
161161
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
162162
backend_mock_aws = Mock()
163163
backend_mock_aws.TYPE = BackendType.AWS
164-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = []
164+
backend_mock_aws.compute.return_value.get_offers.return_value = []
165165
m.return_value = [backend_mock_aws]
166166

167167
response = await client.post(
@@ -310,7 +310,7 @@ async def test_exact_aggregation_values(
310310
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
311311
backend_mock_aws = Mock()
312312
backend_mock_aws.TYPE = BackendType.AWS
313-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = [
313+
backend_mock_aws.compute.return_value.get_offers.return_value = [
314314
offer_t4_spot,
315315
offer_t4_ondemand,
316316
offer_t4_quota,
@@ -319,7 +319,7 @@ async def test_exact_aggregation_values(
319319

320320
backend_mock_runpod = Mock()
321321
backend_mock_runpod.TYPE = BackendType.RUNPOD
322-
backend_mock_runpod.compute.return_value.get_offers_cached.return_value = [
322+
backend_mock_runpod.compute.return_value.get_offers.return_value = [
323323
offer_runpod_rtx_east,
324324
offer_runpod_rtx_eu,
325325
offer_runpod_t4_east,

‎src/tests/_internal/server/routers/test_runs.py‎

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -997,12 +997,10 @@ async def test_returns_run_plan_privileged_false(
997997
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
998998
backend_mock_aws = Mock()
999999
backend_mock_aws.TYPE = BackendType.AWS
1000-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = [offer_aws]
1000+
backend_mock_aws.compute.return_value.get_offers.return_value = [offer_aws]
10011001
backend_mock_runpod = Mock()
10021002
backend_mock_runpod.TYPE = BackendType.RUNPOD
1003-
backend_mock_runpod.compute.return_value.get_offers_cached.return_value = [
1004-
offer_runpod
1005-
]
1003+
backend_mock_runpod.compute.return_value.get_offers.return_value = [offer_runpod]
10061004
m.return_value = [backend_mock_aws, backend_mock_runpod]
10071005
response = await client.post(
10081006
f"/api/project/{project.name}/runs/get_plan",
@@ -1059,12 +1057,10 @@ async def test_returns_run_plan_privileged_true(
10591057
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
10601058
backend_mock_aws = Mock()
10611059
backend_mock_aws.TYPE = BackendType.AWS
1062-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = [offer_aws]
1060+
backend_mock_aws.compute.return_value.get_offers.return_value = [offer_aws]
10631061
backend_mock_runpod = Mock()
10641062
backend_mock_runpod.TYPE = BackendType.RUNPOD
1065-
backend_mock_runpod.compute.return_value.get_offers_cached.return_value = [
1066-
offer_runpod
1067-
]
1063+
backend_mock_runpod.compute.return_value.get_offers.return_value = [offer_runpod]
10681064
m.return_value = [backend_mock_aws, backend_mock_runpod]
10691065
response = await client.post(
10701066
f"/api/project/{project.name}/runs/get_plan",
@@ -1121,12 +1117,10 @@ async def test_returns_run_plan_docker_true(
11211117
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
11221118
backend_mock_aws = Mock()
11231119
backend_mock_aws.TYPE = BackendType.AWS
1124-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = [offer_aws]
1120+
backend_mock_aws.compute.return_value.get_offers.return_value = [offer_aws]
11251121
backend_mock_runpod = Mock()
11261122
backend_mock_runpod.TYPE = BackendType.RUNPOD
1127-
backend_mock_runpod.compute.return_value.get_offers_cached.return_value = [
1128-
offer_runpod
1129-
]
1123+
backend_mock_runpod.compute.return_value.get_offers.return_value = [offer_runpod]
11301124
m.return_value = [backend_mock_aws, backend_mock_runpod]
11311125
response = await client.post(
11321126
f"/api/project/{project.name}/runs/get_plan",
@@ -1183,12 +1177,10 @@ async def test_returns_run_plan_instance_volumes(
11831177
with patch("dstack._internal.server.services.backends.get_project_backends") as m:
11841178
backend_mock_aws = Mock()
11851179
backend_mock_aws.TYPE = BackendType.AWS
1186-
backend_mock_aws.compute.return_value.get_offers_cached.return_value = [offer_aws]
1180+
backend_mock_aws.compute.return_value.get_offers.return_value = [offer_aws]
11871181
backend_mock_runpod = Mock()
11881182
backend_mock_runpod.TYPE = BackendType.RUNPOD
1189-
backend_mock_runpod.compute.return_value.get_offers_cached.return_value = [
1190-
offer_runpod
1191-
]
1183+
backend_mock_runpod.compute.return_value.get_offers.return_value = [offer_runpod]
11921184
m.return_value = [backend_mock_aws, backend_mock_runpod]
11931185
response = await client.post(
11941186
f"/api/project/{project.name}/runs/get_plan",

‎src/tests/_internal/server/services/test_offers.py‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,11 @@ async def test_returns_all_offers(self):
2323
aws_backend_mock = Mock()
2424
aws_backend_mock.TYPE = BackendType.AWS
2525
aws_offer = get_instance_offer_with_availability(backend=BackendType.AWS)
26-
aws_backend_mock.compute.return_value.get_offers_cached.return_value = [aws_offer]
26+
aws_backend_mock.compute.return_value.get_offers.return_value = [aws_offer]
2727
runpod_backend_mock = Mock()
2828
runpod_backend_mock.TYPE = BackendType.RUNPOD
2929
runpod_offer = get_instance_offer_with_availability(backend=BackendType.RUNPOD)
30-
runpod_backend_mock.compute.return_value.get_offers_cached.return_value = [
31-
runpod_offer
32-
]
30+
runpod_backend_mock.compute.return_value.get_offers.return_value = [runpod_offer]
3331
m.return_value = [aws_backend_mock, runpod_backend_mock]
3432
res = await get_offers_by_requirements(
3533
project=Mock(),
@@ -47,13 +45,11 @@ async def test_returns_multinode_offers(self):
4745
aws_backend_mock = Mock()
4846
aws_backend_mock.TYPE = BackendType.AWS
4947
aws_offer = get_instance_offer_with_availability(backend=BackendType.AWS)
50-
aws_backend_mock.compute.return_value.get_offers_cached.return_value = [aws_offer]
48+
aws_backend_mock.compute.return_value.get_offers.return_value = [aws_offer]
5149
runpod_backend_mock = Mock()
5250
runpod_backend_mock.TYPE = BackendType.RUNPOD
5351
runpod_offer = get_instance_offer_with_availability(backend=BackendType.RUNPOD)
54-
runpod_backend_mock.compute.return_value.get_offers_cached.return_value = [
55-
runpod_offer
56-
]
52+
runpod_backend_mock.compute.return_value.get_offers.return_value = [runpod_offer]
5753
m.return_value = [aws_backend_mock, runpod_backend_mock]
5854
res = await get_offers_by_requirements(
5955
project=Mock(),
@@ -72,7 +68,7 @@ async def test_returns_volume_offers(self):
7268
aws_backend_mock = Mock()
7369
aws_backend_mock.TYPE = BackendType.AWS
7470
aws_offer = get_instance_offer_with_availability(backend=BackendType.AWS)
75-
aws_backend_mock.compute.return_value.get_offers_cached.return_value = [aws_offer]
71+
aws_backend_mock.compute.return_value.get_offers.return_value = [aws_offer]
7672
runpod_backend_mock = Mock()
7773
runpod_backend_mock.TYPE = BackendType.RUNPOD
7874
runpod_offer1 = get_instance_offer_with_availability(
@@ -81,7 +77,7 @@ async def test_returns_volume_offers(self):
8177
runpod_offer2 = get_instance_offer_with_availability(
8278
backend=BackendType.RUNPOD, region="us"
8379
)
84-
runpod_backend_mock.compute.return_value.get_offers_cached.return_value = [
80+
runpod_backend_mock.compute.return_value.get_offers.return_value = [
8581
runpod_offer1,
8682
runpod_offer2,
8783
]
@@ -124,7 +120,7 @@ async def test_returns_az_offers(self):
124120
aws_offer4 = get_instance_offer_with_availability(
125121
backend=BackendType.AWS, availability_zones=None
126122
)
127-
aws_backend_mock.compute.return_value.get_offers_cached.return_value = [
123+
aws_backend_mock.compute.return_value.get_offers.return_value = [
128124
aws_offer1,
129125
aws_offer2,
130126
aws_offer3,
@@ -148,13 +144,11 @@ async def test_returns_no_offers_for_multinode_instance_mounts_and_non_multinode
148144
aws_backend_mock = Mock()
149145
aws_backend_mock.TYPE = BackendType.AWS
150146
aws_offer = get_instance_offer_with_availability(backend=BackendType.AWS)
151-
aws_backend_mock.compute.return_value.get_offers_cached.return_value = [aws_offer]
147+
aws_backend_mock.compute.return_value.get_offers.return_value = [aws_offer]
152148
runpod_backend_mock = Mock()
153149
runpod_backend_mock.TYPE = BackendType.RUNPOD
154150
runpod_offer = get_instance_offer_with_availability(backend=BackendType.RUNPOD)
155-
runpod_backend_mock.compute.return_value.get_offers_cached.return_value = [
156-
runpod_offer
157-
]
151+
runpod_backend_mock.compute.return_value.get_offers.return_value = [runpod_offer]
158152
m.return_value = [aws_backend_mock, runpod_backend_mock]
159153
res = await get_offers_by_requirements(
160154
project=Mock(),

0 commit comments

Comments
 (0)