Skip to content

Commit bb7eb30

Browse files
authored
test changes logging debug -> error (#64)
### Changes - disable adopted resource test from canaries until its stable - test logging debug -> error since log level is set to [INFO in PR builds](https://github.com/aws-controllers-k8s/sagemaker-controller/blob/522c147abcca72d97539f7296f000105b7b1dc26/test/e2e/service_bootstrap.py#L123) - add missing tags assertion in feature group and increase the timeout - tags test might be flaky changed the position. lets see if that works ### Testing PR build
1 parent 60bbd16 commit bb7eb30

11 files changed

+31
-31
lines changed

test/canary/scripts/run_test.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ function cleanup {
4545
kubectl delete adoptedresources --all
4646
kubectl delete featuregroups --all
4747
kubectl delete modelpackagegroups --all
48+
kubectl delete modelpackages --all
4849

4950
print_controller_logs
5051

test/e2e/common/fixtures.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def xgboost_churn_endpoint(sagemaker_client):
5252
)
5353
assert model_resource is not None
5454
if k8s.get_resource_arn(model_resource) is None:
55-
logging.debug(
55+
logging.error(
5656
f"ARN for this resource is None, resource status is: {model_resource['status']}"
5757
)
5858
assert k8s.get_resource_arn(model_resource) is not None
@@ -69,7 +69,7 @@ def xgboost_churn_endpoint(sagemaker_client):
6969
)
7070
assert endpoint_config_resource is not None
7171
if k8s.get_resource_arn(endpoint_config_resource) is None:
72-
logging.debug(
72+
logging.error(
7373
f"ARN for this resource is None, resource status is: {endpoint_config_resource['status']}"
7474
)
7575
assert k8s.get_resource_arn(endpoint_config_resource) is not None
@@ -82,7 +82,7 @@ def xgboost_churn_endpoint(sagemaker_client):
8282
)
8383
assert endpoint_resource is not None
8484
if k8s.get_resource_arn(endpoint_resource) is None:
85-
logging.debug(
85+
logging.error(
8686
f"ARN for this resource is None, resource status is: {endpoint_resource['status']}"
8787
)
8888
assert k8s.get_resource_arn(endpoint_resource) is not None

test/e2e/tests/test_adopt_endpoint.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ def adopted_endpoint(sdk_endpoint):
170170

171171

172172
@service_marker
173-
@pytest.mark.canary
174173
class TestAdoptedEndpoint:
175174
def test_smoke(self, sdk_endpoint, adopted_endpoint):
176175
(

test/e2e/tests/test_endpoint.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def single_container_model(name_suffix):
5555
)
5656
assert model_resource is not None
5757
if k8s.get_resource_arn(model_resource) is None:
58-
logging.debug(
58+
logging.error(
5959
f"ARN for this resource is None, resource status is: {model_resource['status']}"
6060
)
6161
assert k8s.get_resource_arn(model_resource) is not None
@@ -84,7 +84,7 @@ def multi_variant_config(name_suffix, single_container_model):
8484
)
8585
assert config_resource is not None
8686
if k8s.get_resource_arn(config_resource) is None:
87-
logging.debug(
87+
logging.error(
8888
f"ARN for this resource is None, resource status is: {config_resource['status']}"
8989
)
9090
assert k8s.get_resource_arn(config_resource) is not None
@@ -113,7 +113,7 @@ def single_variant_config(name_suffix, single_container_model):
113113
)
114114
assert config_resource is not None
115115
if k8s.get_resource_arn(config_resource) is None:
116-
logging.debug(
116+
logging.error(
117117
f"ARN for this resource is None, resource status is: {config_resource['status']}"
118118
)
119119
assert k8s.get_resource_arn(config_resource) is not None
@@ -175,7 +175,7 @@ def faulty_config(name_suffix, single_container_model):
175175
)
176176
assert model_resource is not None
177177
if k8s.get_resource_arn(model_resource) is None:
178-
logging.debug(
178+
logging.error(
179179
f"ARN for this resource is None, resource status is: {model_resource['status']}"
180180
)
181181
assert k8s.get_resource_arn(model_resource) is not None
@@ -195,7 +195,7 @@ def faulty_config(name_suffix, single_container_model):
195195
)
196196
assert config_resource is not None
197197
if k8s.get_resource_arn(config_resource) is None:
198-
logging.debug(
198+
logging.error(
199199
f"ARN for this resource is None, resource status is: {config_resource['status']}"
200200
)
201201
assert k8s.get_resource_arn(config_resource) is not None

test/e2e/tests/test_endpoint_config.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def single_variant_config():
4848
)
4949
assert model_resource is not None
5050
if k8s.get_resource_arn(model_resource) is None:
51-
logging.debug(
51+
logging.error(
5252
f"ARN for this resource is None, resource status is: {model_resource['status']}"
5353
)
5454
assert k8s.get_resource_arn(model_resource) is not None

test/e2e/tests/test_feature_group.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@
3636
SPEC_FILE = "feature_group"
3737
FEATURE_GROUP_STATUS_CREATING = "Creating"
3838
FEATURE_GROUP_STATUS_CREATED = "Created"
39-
WAIT_PERIOD_COUNT = 3
40-
# A 15 second wait period is used because we sometimes see
41-
# time out errors at a 10 second wait period.
42-
WAIT_PERIOD_LENGTH = 15
39+
# longer wait is used because we sometimes see server taking time to create/delete
40+
WAIT_PERIOD_COUNT = 4
41+
WAIT_PERIOD_LENGTH = 30
4342
STATUS = "status"
4443
RESOURCE_STATUS = "featureGroupStatus"
4544

@@ -140,15 +139,13 @@ def test_create_feature_group(self, feature_group):
140139

141140
feature_group_name = resource["spec"].get("featureGroupName", None)
142141
assert feature_group_name is not None
143-
144-
feature_group_describe_response = get_sagemaker_feature_group(feature_group_name)
145-
146-
assert (
147-
k8s.get_resource_arn(resource)
148-
== feature_group_describe_response["FeatureGroupArn"]
149-
)
150142

151-
assert feature_group_describe_response["FeatureGroupStatus"] == FEATURE_GROUP_STATUS_CREATING
143+
feature_group_sm_desc = get_sagemaker_feature_group(feature_group_name)
144+
feature_group_arn = feature_group_sm_desc["FeatureGroupArn"]
145+
146+
assert k8s.get_resource_arn(resource) == feature_group_arn
147+
148+
assert feature_group_sm_desc["FeatureGroupStatus"] == FEATURE_GROUP_STATUS_CREATING
152149

153150
assert k8s.wait_on_condition(reference, "ACK.ResourceSynced", "False")
154151

@@ -158,6 +155,9 @@ def test_create_feature_group(self, feature_group):
158155

159156
assert k8s.wait_on_condition(reference, "ACK.ResourceSynced", "True")
160157

158+
resource_tags = resource["spec"].get("tags", None)
159+
assert_tags_in_sync(feature_group_arn, resource_tags)
160+
161161
# Delete the k8s resource.
162162
_, deleted = k8s.delete_custom_resource(
163163
reference, WAIT_PERIOD_COUNT, WAIT_PERIOD_LENGTH

test/e2e/tests/test_hpo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def xgboost_hpojob():
4848
)
4949
assert resource is not None
5050
if k8s.get_resource_arn(resource) is None:
51-
logging.debug(
51+
logging.error(
5252
f"ARN for this resource is None, resource status is: {resource['status']}"
5353
)
5454
assert k8s.get_resource_arn(resource) is not None

test/e2e/tests/test_processingjob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def kmeans_processing_job():
4848

4949
assert resource is not None
5050
if k8s.get_resource_arn(resource) is None:
51-
logging.debug(
51+
logging.error(
5252
f"ARN for this resource is None, resource status is: {resource['status']}"
5353
)
5454
assert k8s.get_resource_arn(resource) is not None

test/e2e/tests/test_trainingjob.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def xgboost_training_job():
4848

4949
assert resource is not None
5050
if k8s.get_resource_arn(resource) is None:
51-
logging.debug(
51+
logging.error(
5252
f"ARN for this resource is None, resource status is: {resource['status']}"
5353
)
5454
assert k8s.get_resource_arn(resource) is not None

test/e2e/tests/test_trainingjob_debugger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def xgboost_training_job_debugger():
4646
replacements=replacements,
4747
)
4848
if k8s.get_resource_arn(resource) is None:
49-
logging.debug(
49+
logging.error(
5050
f"ARN for this resource is None, resource status is: {resource['status']}"
5151
)
5252
assert resource is not None

0 commit comments

Comments
 (0)