Skip to content

Commit 4265635

Browse files
committed
Fix unsynced objects in multicluster tests
Signed-off-by: averevki <[email protected]>
1 parent e6c9afe commit 4265635

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

testsuite/tests/multicluster/load_balanced/test_change_default_geo.py

+6-4
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ def test_change_default_geo(hostname, gateway, gateway2, dns_policy, dns_policy2
1515

1616
assert resolver.resolve(hostname.hostname)[0].address == gateway.external_ip().split(":")[0]
1717

18-
dns_policy.model.spec.loadBalancing.defaultGeo = False
19-
dns_policy.apply()
18+
dns_policy.refresh().model.spec.loadBalancing.defaultGeo = False
19+
res = dns_policy.apply()
20+
assert res.status() == 0, res.err()
2021
dns_policy.wait_for_ready()
2122

22-
dns_policy2.model.spec.loadBalancing.defaultGeo = True
23-
dns_policy2.apply()
23+
dns_policy2.refresh().model.spec.loadBalancing.defaultGeo = True
24+
res2 = dns_policy2.apply()
25+
assert res2.status() == 0, res2.err()
2426
dns_policy2.wait_for_ready()
2527

2628
sleep(300) # wait for DNS propagation on providers

testsuite/tests/multicluster/load_balanced/test_change_strategy.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ def test_change_lb_strategy(hostname, gateway, gateway2, dns_policy2, dns_server
1919
resolver.nameservers = [dns_server2["address"]]
2020
assert resolver.resolve(hostname.hostname)[0].address == gateway2.external_ip().split(":")[0]
2121

22-
dns_policy2.model.spec.pop("loadBalancing")
23-
dns_policy2.apply()
22+
dns_policy2.refresh().model.spec.pop("loadBalancing")
23+
res = dns_policy2.apply()
24+
assert res.status() == 0, res.err()
2425
assert dns_policy2.wait_until(
2526
has_record_condition(
2627
"Ready",
@@ -29,7 +30,7 @@ def test_change_lb_strategy(hostname, gateway, gateway2, dns_policy2, dns_server
2930
"The DNS provider failed to ensure the record: record type conflict, cannot update endpoint "
3031
f"'{wildcard_domain}' with record type 'A' when endpoint already exists with record type 'CNAME'",
3132
)
32-
)
33+
), f"DNSPolicy did not reach expected record status, instead it was: {dns_policy2.model.status.recordConditions}"
3334

3435
sleep(300) # wait for DNS propagation on providers
3536
assert resolver.resolve(hostname.hostname)[0].address == gateway.external_ip().split(":")[0]

testsuite/tests/multicluster/load_balanced/test_unsupported_geocode.py

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010

1111
def test_unsupported_geocode(dns_policy2):
1212
"""Change default geocode to not existent one and verify that policy became not enforced"""
13-
dns_policy2.model.spec.loadBalancing.geo = "XX"
14-
dns_policy2.apply()
13+
dns_policy2.refresh().model.spec.loadBalancing.geo = "XX"
14+
res = dns_policy2.apply()
15+
assert res.status() == 0, res.err()
1516

1617
assert dns_policy2.wait_until(has_condition("Enforced", "False"))
1718
assert dns_policy2.wait_until(

0 commit comments

Comments
 (0)