Skip to content

Commit b4fc2fd

Browse files
committed
fix: wait for resource sync on adoption test
1 parent 375fc38 commit b4fc2fd

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,3 +94,5 @@ require (
9494
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
9595
sigs.k8s.io/yaml v1.4.0 // indirect
9696
)
97+
98+
replace github.com/aws-controllers-k8s/runtime => github.com/michaelhtm/ack-runtime v0.43.1-0.20250506174146-287caf1a99bf

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
github.com/aws-controllers-k8s/runtime v0.45.0 h1:b0xCqIE1SNve/jcJPW/QkCGkDmjxWtWTDFHKZpHJcFQ=
2-
github.com/aws-controllers-k8s/runtime v0.45.0/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
31
github.com/aws/aws-sdk-go v1.49.0 h1:g9BkW1fo9GqKfwg2+zCD+TW/D36Ux+vtfJ8guF4AYmY=
42
github.com/aws/aws-sdk-go v1.49.0/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
53
github.com/aws/aws-sdk-go-v2 v1.34.0 h1:9iyL+cjifckRGEVpRKZP3eIxVlL06Qk1Tk13vreaVQU=
@@ -117,6 +115,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0
117115
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
118116
github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
119117
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
118+
github.com/michaelhtm/ack-runtime v0.43.1-0.20250506174146-287caf1a99bf h1:uAUkVhKf5FspEkGwaBA3ymu5R4INjRxHvrX9VGUdaYA=
119+
github.com/michaelhtm/ack-runtime v0.43.1-0.20250506174146-287caf1a99bf/go.mod h1:G2UMBKA7qgXG4JV16NTIUp715uqvUEvWaa7TG1I527U=
120120
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
121121
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
122122
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

test/e2e/tests/test_bucket_adoption_policy.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,8 +217,9 @@ def test_adoption_update_tags(
217217

218218
k8s.patch_custom_resource(ref, updates)
219219
time.sleep(MODIFY_WAIT_AFTER_SECONDS)
220+
k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5)
220221

221-
cr = k8s.wait_resource_consumed_by_controller(ref)
222+
cr = k8s.get_resource(ref)
222223
assert cr is not None
223224
assert 'spec' in cr
224225
assert 'tagging' in cr['spec']

0 commit comments

Comments
 (0)