Skip to content

Commit aa510f8

Browse files
committed
fix cr
1 parent 9a4da2f commit aa510f8

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

test/e2e/tests/resource_test.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
from e2e.common.waiter import wait_until_deleted, safe_get
2828
from e2e.replacement_values import REPLACEMENT_VALUES
2929
from .rest_api_test import simple_rest_api
30+
from acktest.k8s import condition
3031

3132
RESOURCE_RESOURCE_PLURAL = "resources"
3233
MODIFY_WAIT_AFTER_SECONDS = 60
@@ -62,14 +63,22 @@ def simple_resource(simple_rest_api, apigateway_client) -> Tuple[k8s.CustomResou
6263

6364
k8s.create_custom_resource(ref, resource_data)
6465
cr = k8s.wait_resource_consumed_by_controller(ref, wait_periods=30)
66+
67+
6568
assert cr is not None
6669
assert cr['status']['id'] is not None
6770
assert k8s.get_resource_exists(ref)
6871
resource_query = {
6972
'restApiId': rest_api_cr['status']['id'],
7073
'resourceId': cr['status']['id'],
7174
}
72-
time.sleep(30)
75+
k8s.wait_on_condition(
76+
ref,
77+
condition.CONDITION_TYPE_RESOURCE_SYNCED,
78+
"True",
79+
wait_periods=60,
80+
)
81+
cr = k8s.get_resource(ref)
7382
yield ref, cr, rest_api_cr, resource_query
7483

7584
_, deleted = k8s.delete_custom_resource(ref, 10, 30)

test/e2e/tests/rest_api_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,13 @@ def simple_rest_api(apigateway_client) -> Tuple[k8s.CustomResourceReference, Dic
7575
cr = k8s.wait_resource_consumed_by_controller(ref, wait_periods=60)
7676
assert cr is not None
7777
assert k8s.get_resource_exists(ref)
78-
assert k8s.wait_on_condition(
78+
k8s.wait_on_condition(
7979
ref,
8080
condition.CONDITION_TYPE_RESOURCE_SYNCED,
8181
"True",
8282
wait_periods=MAX_WAIT_FOR_SYNCED_MINUTES,
8383
)
84-
time.sleep(4*MODIFY_WAIT_AFTER_SECONDS)
84+
cr = k8s.get_resource(ref)
8585
yield ref, cr
8686

8787
_, deleted = k8s.delete_custom_resource(ref, 10, 30)

0 commit comments

Comments
 (0)