Skip to content

Commit 641bb9d

Browse files
author
Jonathan Makunga
committed
Fix unit tests
1 parent bdd6c63 commit 641bb9d

File tree

1 file changed

+58
-21
lines changed

1 file changed

+58
-21
lines changed

tests/unit/test_session.py

Lines changed: 58 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3192,7 +3192,9 @@ def test_create_model_from_job_with_vpc_config_override(sagemaker_session):
31923192

31933193
def test_endpoint_from_production_variants(sagemaker_session):
31943194
ims = sagemaker_session
3195-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3195+
ims.sagemaker_client.describe_endpoint = Mock(
3196+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3197+
)
31963198
pvs = [
31973199
sagemaker.production_variant("A", "ml.p2.xlarge"),
31983200
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -3487,7 +3489,7 @@ def test_endpoint_from_production_variants_with_sagemaker_config_injection(
34873489
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT_CONFIG
34883490

34893491
sagemaker_session.sagemaker_client.describe_endpoint = Mock(
3490-
return_value={"EndpointStatus": "InService"}
3492+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
34913493
)
34923494
pvs = [
34933495
sagemaker.production_variant("A", "ml.p2.xlarge"),
@@ -3555,7 +3557,7 @@ def test_endpoint_from_production_variants_with_sagemaker_config_injection_parti
35553557
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT_CONFIG
35563558

35573559
sagemaker_session.sagemaker_client.describe_endpoint = Mock(
3558-
return_value={"EndpointStatus": "InService"}
3560+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
35593561
)
35603562
pvs = [
35613563
sagemaker.production_variant("A", "ml.g5.xlarge"),
@@ -3619,7 +3621,7 @@ def test_endpoint_from_production_variants_with_sagemaker_config_injection_no_km
36193621
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT_CONFIG
36203622

36213623
sagemaker_session.sagemaker_client.describe_endpoint = Mock(
3622-
return_value={"EndpointStatus": "InService"}
3624+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
36233625
)
36243626
pvs = [
36253627
sagemaker.production_variant("A", "ml.g5.xlarge"),
@@ -3726,7 +3728,9 @@ def test_create_endpoint_config_with_explainer_config(sagemaker_session):
37263728

37273729
def test_endpoint_from_production_variants_with_tags(sagemaker_session):
37283730
ims = sagemaker_session
3729-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3731+
ims.sagemaker_client.describe_endpoint = Mock(
3732+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3733+
)
37303734
pvs = [
37313735
sagemaker.production_variant("A", "ml.p2.xlarge"),
37323736
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -3757,7 +3761,9 @@ def test_endpoint_from_production_variants_with_combined_sagemaker_config_inject
37573761
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT_ENDPOINT_CONFIG_COMBINED
37583762

37593763
ims = sagemaker_session
3760-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3764+
ims.sagemaker_client.describe_endpoint = Mock(
3765+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3766+
)
37613767
pvs = [
37623768
sagemaker.production_variant("A", "ml.p2.xlarge"),
37633769
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -3801,7 +3807,9 @@ def test_endpoint_from_production_variants_with_sagemaker_config_injection_tags(
38013807
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT
38023808

38033809
ims = sagemaker_session
3804-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3810+
ims.sagemaker_client.describe_endpoint = Mock(
3811+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3812+
)
38053813
pvs = [
38063814
sagemaker.production_variant("A", "ml.p2.xlarge"),
38073815
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -3830,7 +3838,9 @@ def test_endpoint_from_production_variants_with_sagemaker_config_injection_tags(
38303838

38313839
def test_endpoint_from_production_variants_with_accelerator_type(sagemaker_session):
38323840
ims = sagemaker_session
3833-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3841+
ims.sagemaker_client.describe_endpoint = Mock(
3842+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3843+
)
38343844
pvs = [
38353845
sagemaker.production_variant("A", "ml.p2.xlarge", accelerator_type=ACCELERATOR_TYPE),
38363846
sagemaker.production_variant("B", "p299.4096xlarge", accelerator_type=ACCELERATOR_TYPE),
@@ -3861,7 +3871,9 @@ def test_endpoint_from_production_variants_with_accelerator_type_sagemaker_confi
38613871
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT
38623872

38633873
ims = sagemaker_session
3864-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3874+
ims.sagemaker_client.describe_endpoint = Mock(
3875+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3876+
)
38653877
pvs = [
38663878
sagemaker.production_variant("A", "ml.p2.xlarge", accelerator_type=ACCELERATOR_TYPE),
38673879
sagemaker.production_variant("B", "p299.4096xlarge", accelerator_type=ACCELERATOR_TYPE),
@@ -3892,7 +3904,9 @@ def test_endpoint_from_production_variants_with_serverless_inference_config(
38923904
sagemaker_session,
38933905
):
38943906
ims = sagemaker_session
3895-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3907+
ims.sagemaker_client.describe_endpoint = Mock(
3908+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3909+
)
38963910
pvs = [
38973911
sagemaker.production_variant(
38983912
"A", "ml.p2.xlarge", serverless_inference_config=SERVERLESS_INFERENCE_CONFIG
@@ -3929,7 +3943,9 @@ def test_endpoint_from_production_variants_with_serverless_inference_config_sage
39293943
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT
39303944

39313945
ims = sagemaker_session
3932-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3946+
ims.sagemaker_client.describe_endpoint = Mock(
3947+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3948+
)
39333949
pvs = [
39343950
sagemaker.production_variant(
39353951
"A", "ml.p2.xlarge", serverless_inference_config=SERVERLESS_INFERENCE_CONFIG
@@ -3964,7 +3980,9 @@ def test_endpoint_from_production_variants_with_serverless_inference_config_sage
39643980

39653981
def test_endpoint_from_production_variants_with_async_config(sagemaker_session):
39663982
ims = sagemaker_session
3967-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
3983+
ims.sagemaker_client.describe_endpoint = Mock(
3984+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
3985+
)
39683986
pvs = [
39693987
sagemaker.production_variant("A", "ml.p2.xlarge"),
39703988
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -4000,7 +4018,9 @@ def test_endpoint_from_production_variants_with_async_config_sagemaker_config_in
40004018
sagemaker_session.sagemaker_config = SAGEMAKER_CONFIG_ENDPOINT
40014019

40024020
ims = sagemaker_session
4003-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
4021+
ims.sagemaker_client.describe_endpoint = Mock(
4022+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
4023+
)
40044024
pvs = [
40054025
sagemaker.production_variant("A", "ml.p2.xlarge"),
40064026
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -4037,7 +4057,9 @@ def test_endpoint_from_production_variants_with_clarify_explainer_config(
40374057
sagemaker_session,
40384058
):
40394059
ims = sagemaker_session
4040-
ims.sagemaker_client.describe_endpoint = Mock(return_value={"EndpointStatus": "InService"})
4060+
ims.sagemaker_client.describe_endpoint = Mock(
4061+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
4062+
)
40414063
pvs = [
40424064
sagemaker.production_variant("A", "ml.p2.xlarge"),
40434065
sagemaker.production_variant("B", "p299.4096xlarge"),
@@ -4069,7 +4091,7 @@ def test_endpoint_from_production_variants_with_clarify_explainer_config(
40694091

40704092
def test_update_endpoint_succeed(sagemaker_session):
40714093
sagemaker_session.sagemaker_client.describe_endpoint = Mock(
4072-
return_value={"EndpointStatus": "InService"}
4094+
return_value={"EndpointStatus": "InService", "EndpointArn": "arn:aws:sagemaker:"}
40734095
)
40744096
endpoint_name = "some-endpoint"
40754097
endpoint_config = "some-endpoint-config"
@@ -4079,7 +4101,7 @@ def test_update_endpoint_succeed(sagemaker_session):
40794101

40804102
def test_update_endpoint_no_wait(sagemaker_session):
40814103
sagemaker_session.sagemaker_client.describe_endpoint = Mock(
4082-
return_value={"EndpointStatus": "Updating"}
4104+
return_value={"EndpointStatus": "Updating", "EndpointArn": "arn:aws:sagemaker:"}
40834105
)
40844106
endpoint_name = "some-endpoint"
40854107
endpoint_config = "some-endpoint-config"
@@ -6136,7 +6158,10 @@ def test_upload_data_default_bucket_and_prefix_combinations(
61366158

61376159
def test_is_inference_component_based_endpoint_affirmative(sagemaker_session):
61386160

6139-
describe_endpoint_response = {"EndpointConfigName": "some-endpoint-config"}
6161+
describe_endpoint_response = {
6162+
"EndpointConfigName": "some-endpoint-config",
6163+
"EndpointArn": "arn:aws:sagemaker:",
6164+
}
61406165
describe_endpoint_config_response = {
61416166
"ExecutionRoleArn": "some-role-arn",
61426167
"ProductionVariants": [{"VariantName": "AllTraffic"}],
@@ -6160,7 +6185,10 @@ def test_is_inference_component_based_endpoint_affirmative(sagemaker_session):
61606185

61616186
def test_is_inference_component_based_endpoint_negative_no_role(sagemaker_session):
61626187

6163-
describe_endpoint_response = {"EndpointConfigName": "some-endpoint-config"}
6188+
describe_endpoint_response = {
6189+
"EndpointConfigName": "some-endpoint-config",
6190+
"EndpointArn": "arn:aws:sagemaker:",
6191+
}
61646192
describe_endpoint_config_response = {
61656193
"ProductionVariants": [{"VariantName": "AllTraffic"}],
61666194
}
@@ -6183,7 +6211,10 @@ def test_is_inference_component_based_endpoint_negative_no_role(sagemaker_sessio
61836211

61846212
def test_is_inference_component_based_endpoint_positive_multiple_variants(sagemaker_session):
61856213

6186-
describe_endpoint_response = {"EndpointConfigName": "some-endpoint-config"}
6214+
describe_endpoint_response = {
6215+
"EndpointConfigName": "some-endpoint-config",
6216+
"EndpointArn": "arn:aws:sagemaker:",
6217+
}
61876218
describe_endpoint_config_response = {
61886219
"ExecutionRoleArn": "some-role-arn",
61896220
"ProductionVariants": [{"VariantName": "AllTraffic1"}, {"VariantName": "AllTraffic2"}],
@@ -6207,7 +6238,10 @@ def test_is_inference_component_based_endpoint_positive_multiple_variants(sagema
62076238

62086239
def test_is_inference_component_based_endpoint_negative_no_variants(sagemaker_session):
62096240

6210-
describe_endpoint_response = {"EndpointConfigName": "some-endpoint-config"}
6241+
describe_endpoint_response = {
6242+
"EndpointConfigName": "some-endpoint-config",
6243+
"EndpointArn": "arn:aws:sagemaker:",
6244+
}
62116245
describe_endpoint_config_response = {
62126246
"ExecutionRoleArn": "some-role-arn",
62136247
"ProductionVariants": [],
@@ -6231,7 +6265,10 @@ def test_is_inference_component_based_endpoint_negative_no_variants(sagemaker_se
62316265

62326266
def test_is_inference_component_based_endpoint_negative_model_name_present(sagemaker_session):
62336267

6234-
describe_endpoint_response = {"EndpointConfigName": "some-endpoint-config"}
6268+
describe_endpoint_response = {
6269+
"EndpointConfigName": "some-endpoint-config",
6270+
"EndpointArn": "arn:aws:sagemaker:",
6271+
}
62356272
describe_endpoint_config_response = {
62366273
"ExecutionRoleArn": "some-role-arn",
62376274
"ProductionVariants": [

0 commit comments

Comments
 (0)