Skip to content

Commit 76efed5

Browse files
mollyheamazonmollyheamazon
committed
new tests
1 parent c69de67 commit 76efed5

File tree

10 files changed

+99
-99
lines changed

10 files changed

+99
-99
lines changed

‎.githooks/pre-push

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ start_time=`date +%s`
1212
tox -e sphinx,doc8 --parallel all
1313
./ci-scripts/displaytime.sh 'sphinx,doc8' $start_time
1414
start_time=`date +%s`
15-
tox -e py38,py39,py310 --parallel all -- tests/unit
16-
./ci-scripts/displaytime.sh 'py38,py39,py310 unit' $start_time
15+
tox -e py39,py310,py311,py312 --parallel all -- tests/unit
16+
./ci-scripts/displaytime.sh 'py39,py310,py311,py312 unit' $start_time

‎.github/workflows/codebuild-ci-health.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
fail-fast: false
2828
matrix:
29-
python-version: ["py38", "py39", "py310", "py311","py312"]
29+
python-version: ["py39", "py310", "py311","py312"]
3030
steps:
3131
- name: Configure AWS Credentials
3232
uses: aws-actions/configure-aws-credentials@v4

‎.github/workflows/codebuild-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
strategy:
6464
fail-fast: false
6565
matrix:
66-
python-version: ["py38","py39","py310","py311","py312"]
66+
python-version: ["py39","py310","py311","py312"]
6767
steps:
6868
- name: Configure AWS Credentials
6969
uses: aws-actions/configure-aws-credentials@v4

‎tests/unit/sagemaker/huggingface/test_llm_utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def test_huggingface_model_metadata_unauthorized_exception(self, mock_urllib):
6565
"Trying to access a gated/private HuggingFace model without valid credentials. "
6666
"Please provide a HUGGING_FACE_HUB_TOKEN in env_vars"
6767
)
68-
self.assertEquals(expected_error_msg, str(context.exception))
68+
self.assertEqual(expected_error_msg, str(context.exception))
6969

7070
@patch("sagemaker.huggingface.llm_utils.urllib")
7171
def test_huggingface_model_metadata_general_exception(self, mock_urllib):
@@ -76,7 +76,7 @@ def test_huggingface_model_metadata_general_exception(self, mock_urllib):
7676
expected_error_msg = (
7777
f"Did not find model metadata for the following HuggingFace Model ID {MOCK_HF_ID}"
7878
)
79-
self.assertEquals(expected_error_msg, str(context.exception))
79+
self.assertEqual(expected_error_msg, str(context.exception))
8080

8181
@patch("huggingface_hub.snapshot_download")
8282
def test_download_huggingface_model_metadata(self, mock_snapshot_download):

‎tests/unit/sagemaker/jumpstart/estimator/test_sagemaker_config.py

Lines changed: 50 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -123,16 +123,16 @@ def test_without_arg_overwrites_without_kwarg_collisions_with_config(
123123

124124
mock_retrieve_model_init_kwargs.return_value = {}
125125

126-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
127-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), config_role)
126+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
127+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), config_role)
128128
assert "enable_network_isolation" not in mock_estimator_init.call_args[1]
129129
assert "encrypt_inter_container_traffic" not in mock_estimator_init.call_args[1]
130130

131131
estimator.deploy()
132132

133-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
133+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
134134

135-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), config_inference_role)
135+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), config_inference_role)
136136

137137
assert "enable_network_isolation" not in mock_estimator_deploy.call_args[1]
138138

@@ -181,13 +181,13 @@ def test_without_arg_overwrites_with_kwarg_collisions_with_config(
181181
model_id=model_id,
182182
)
183183

184-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
185-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), config_role)
186-
self.assertEquals(
184+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
185+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), config_role)
186+
self.assertEqual(
187187
mock_estimator_init.call_args[1].get("enable_network_isolation"),
188188
config_enable_network_isolation,
189189
)
190-
self.assertEquals(
190+
self.assertEqual(
191191
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
192192
config_intercontainer_encryption,
193193
)
@@ -200,11 +200,11 @@ def test_without_arg_overwrites_with_kwarg_collisions_with_config(
200200

201201
estimator.deploy()
202202

203-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 6)
203+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 6)
204204

205-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), config_inference_role)
205+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), config_inference_role)
206206

207-
self.assertEquals(
207+
self.assertEqual(
208208
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
209209
config_inference_enable_network_isolation,
210210
)
@@ -257,13 +257,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_with_config(
257257
encrypt_inter_container_traffic=override_encrypt_inter_container_traffic,
258258
)
259259

260-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
261-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role)
262-
self.assertEquals(
260+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
261+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role)
262+
self.assertEqual(
263263
mock_estimator_init.call_args[1].get("enable_network_isolation"),
264264
override_enable_network_isolation,
265265
)
266-
self.assertEquals(
266+
self.assertEqual(
267267
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
268268
override_encrypt_inter_container_traffic,
269269
)
@@ -280,13 +280,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_with_config(
280280
enable_network_isolation=override_inference_enable_network_isolation,
281281
)
282282

283-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
283+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
284284

285-
self.assertEquals(
285+
self.assertEqual(
286286
mock_estimator_deploy.call_args[1].get("role"), mock_inference_override_role
287287
)
288288

289-
self.assertEquals(
289+
self.assertEqual(
290290
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
291291
override_inference_enable_network_isolation,
292292
)
@@ -336,13 +336,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_with_config(
336336
encrypt_inter_container_traffic=override_encrypt_inter_container_traffic,
337337
)
338338

339-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
340-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role)
341-
self.assertEquals(
339+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
340+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role)
341+
self.assertEqual(
342342
mock_estimator_init.call_args[1].get("enable_network_isolation"),
343343
override_enable_network_isolation,
344344
)
345-
self.assertEquals(
345+
self.assertEqual(
346346
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
347347
override_encrypt_inter_container_traffic,
348348
)
@@ -355,13 +355,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_with_config(
355355
enable_network_isolation=override_inference_enable_network_isolation,
356356
)
357357

358-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
358+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
359359

360-
self.assertEquals(
360+
self.assertEqual(
361361
mock_estimator_deploy.call_args[1].get("role"), mock_inference_override_role
362362
)
363363

364-
self.assertEquals(
364+
self.assertEqual(
365365
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
366366
override_inference_enable_network_isolation,
367367
)
@@ -412,18 +412,18 @@ def test_without_arg_overwrites_without_kwarg_collisions_without_config(
412412
model_id=model_id,
413413
)
414414

415-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
416-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), execution_role)
415+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
416+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), execution_role)
417417
assert "enable_network_isolation" not in mock_estimator_init.call_args[1]
418418
assert "encrypt_inter_container_traffic" not in mock_estimator_init.call_args[1]
419419

420420
estimator.deploy()
421421

422422
mock_retrieve_model_init_kwargs.return_value = {}
423423

424-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
424+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
425425

426-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), execution_role)
426+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), execution_role)
427427

428428
assert "enable_network_isolation" not in mock_estimator_deploy.call_args[1]
429429

@@ -475,13 +475,13 @@ def test_without_arg_overwrites_with_kwarg_collisions_without_config(
475475
model_id=model_id,
476476
)
477477

478-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
479-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), execution_role)
480-
self.assertEquals(
478+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
479+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), execution_role)
480+
self.assertEqual(
481481
mock_estimator_init.call_args[1].get("enable_network_isolation"),
482482
metadata_enable_network_isolation,
483483
)
484-
self.assertEquals(
484+
self.assertEqual(
485485
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
486486
metadata_intercontainer_encryption,
487487
)
@@ -492,11 +492,11 @@ def test_without_arg_overwrites_with_kwarg_collisions_without_config(
492492

493493
estimator.deploy()
494494

495-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 6)
495+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 6)
496496

497-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), execution_role)
497+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), execution_role)
498498

499-
self.assertEquals(
499+
self.assertEqual(
500500
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
501501
metadata_inference_enable_network_isolation,
502502
)
@@ -548,13 +548,13 @@ def test_with_arg_overwrites_with_kwarg_collisions_without_config(
548548
encrypt_inter_container_traffic=override_encrypt_inter_container_traffic,
549549
)
550550

551-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
552-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role)
553-
self.assertEquals(
551+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
552+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role)
553+
self.assertEqual(
554554
mock_estimator_init.call_args[1].get("enable_network_isolation"),
555555
override_enable_network_isolation,
556556
)
557-
self.assertEquals(
557+
self.assertEqual(
558558
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
559559
override_encrypt_inter_container_traffic,
560560
)
@@ -568,11 +568,11 @@ def test_with_arg_overwrites_with_kwarg_collisions_without_config(
568568
enable_network_isolation=override_inference_enable_network_isolation,
569569
)
570570

571-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
571+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
572572

573-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), override_inference_role)
573+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), override_inference_role)
574574

575-
self.assertEquals(
575+
self.assertEqual(
576576
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
577577
override_inference_enable_network_isolation,
578578
)
@@ -618,13 +618,13 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config(
618618
enable_network_isolation=override_enable_network_isolation,
619619
encrypt_inter_container_traffic=override_encrypt_inter_container_traffic,
620620
)
621-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
622-
self.assertEquals(mock_estimator_init.call_args[1].get("role"), override_role)
623-
self.assertEquals(
621+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
622+
self.assertEqual(mock_estimator_init.call_args[1].get("role"), override_role)
623+
self.assertEqual(
624624
mock_estimator_init.call_args[1].get("enable_network_isolation"),
625625
override_enable_network_isolation,
626626
)
627-
self.assertEquals(
627+
self.assertEqual(
628628
mock_estimator_init.call_args[1].get("encrypt_inter_container_traffic"),
629629
override_encrypt_inter_container_traffic,
630630
)
@@ -634,11 +634,11 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config(
634634
enable_network_isolation=override_enable_network_isolation,
635635
)
636636

637-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 3)
637+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 3)
638638

639-
self.assertEquals(mock_estimator_deploy.call_args[1].get("role"), override_inference_role)
639+
self.assertEqual(mock_estimator_deploy.call_args[1].get("role"), override_inference_role)
640640

641-
self.assertEquals(
641+
self.assertEqual(
642642
mock_estimator_deploy.call_args[1].get("enable_network_isolation"),
643643
override_enable_network_isolation,
644644
)

‎tests/unit/sagemaker/jumpstart/model/test_sagemaker_config.py

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,9 @@ def test_without_arg_overwrites_without_kwarg_collisions_with_config(
9999
model_id=model_id,
100100
)
101101

102-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
102+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
103103

104-
self.assertEquals(mock_model_init.call_args[1].get("role"), config_role)
104+
self.assertEqual(mock_model_init.call_args[1].get("role"), config_role)
105105

106106
assert "enable_network_isolation" not in mock_model_init.call_args[1]
107107

@@ -147,10 +147,10 @@ def test_all_arg_overwrites_without_kwarg_collisions_with_config(
147147
role=override_role,
148148
)
149149

150-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
150+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
151151

152-
self.assertEquals(mock_model_init.call_args[1].get("role"), override_role)
153-
self.assertEquals(
152+
self.assertEqual(mock_model_init.call_args[1].get("role"), override_role)
153+
self.assertEqual(
154154
mock_model_init.call_args[1].get("enable_network_isolation"),
155155
override_enable_network_isolation,
156156
)
@@ -197,10 +197,10 @@ def test_without_arg_overwrites_all_kwarg_collisions_with_config(
197197
model_id=model_id,
198198
)
199199

200-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 2)
200+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 2)
201201

202-
self.assertEquals(mock_model_init.call_args[1].get("role"), config_role)
203-
self.assertEquals(
202+
self.assertEqual(mock_model_init.call_args[1].get("role"), config_role)
203+
self.assertEqual(
204204
mock_model_init.call_args[1].get("enable_network_isolation"),
205205
config_enable_network_isolation,
206206
)
@@ -249,10 +249,10 @@ def test_with_arg_overwrites_all_kwarg_collisions_with_config(
249249
enable_network_isolation=override_enable_network_isolation,
250250
)
251251

252-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
252+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
253253

254-
self.assertEquals(mock_model_init.call_args[1].get("role"), override_role)
255-
self.assertEquals(
254+
self.assertEqual(mock_model_init.call_args[1].get("role"), override_role)
255+
self.assertEqual(
256256
mock_model_init.call_args[1].get("enable_network_isolation"),
257257
override_enable_network_isolation,
258258
)
@@ -299,10 +299,10 @@ def test_without_arg_overwrites_all_kwarg_collisions_without_config(
299299
model_id=model_id,
300300
)
301301

302-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 2)
302+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 2)
303303

304-
self.assertEquals(mock_model_init.call_args[1].get("role"), execution_role)
305-
self.assertEquals(
304+
self.assertEqual(mock_model_init.call_args[1].get("role"), execution_role)
305+
self.assertEqual(
306306
mock_model_init.call_args[1].get("enable_network_isolation"),
307307
metadata_enable_network_isolation,
308308
)
@@ -350,10 +350,10 @@ def test_with_arg_overwrites_all_kwarg_collisions_without_config(
350350
enable_network_isolation=override_enable_network_isolation,
351351
)
352352

353-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
353+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
354354

355-
self.assertEquals(mock_model_init.call_args[1].get("role"), override_role)
356-
self.assertEquals(
355+
self.assertEqual(mock_model_init.call_args[1].get("role"), override_role)
356+
self.assertEqual(
357357
mock_model_init.call_args[1].get("enable_network_isolation"),
358358
override_enable_network_isolation,
359359
)
@@ -398,9 +398,9 @@ def test_without_arg_overwrites_without_kwarg_collisions_without_config(
398398
model_id=model_id,
399399
)
400400

401-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
401+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
402402

403-
self.assertEquals(mock_model_init.call_args[1].get("role"), execution_role)
403+
self.assertEqual(mock_model_init.call_args[1].get("role"), execution_role)
404404
assert "enable_network_isolation" not in mock_model_init.call_args[1]
405405

406406
@mock.patch(
@@ -445,10 +445,10 @@ def test_with_arg_overwrites_without_kwarg_collisions_without_config(
445445
enable_network_isolation=override_enable_network_isolation,
446446
)
447447

448-
self.assertEquals(mock_get_sagemaker_config_value.call_count, 1)
448+
self.assertEqual(mock_get_sagemaker_config_value.call_count, 1)
449449

450-
self.assertEquals(mock_model_init.call_args[1].get("role"), override_role)
451-
self.assertEquals(
450+
self.assertEqual(mock_model_init.call_args[1].get("role"), override_role)
451+
self.assertEqual(
452452
mock_model_init.call_args[1].get("enable_network_isolation"),
453453
override_enable_network_isolation,
454454
)

0 commit comments

Comments
 (0)