Skip to content

Increase stability of integration tests #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
href merged 2 commits into from
Apr 10, 2025
Merged

Increase stability of integration tests #22

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d5b5ce
Increase wait time for peeraddr deployment
href Apr 9, 2025
94baa84
Await services more strictly in tests
href Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions pkg/internal/integration/service_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,15 @@ func (s *IntegrationTestSuite) AwaitServiceReady(

if service.Annotations != nil {
uuid := service.Annotations["k8s.cloudscale.ch/loadbalancer-uuid"]
if uuid != "" {

// EnsureLoadBalancer sets the annotation, and then returns the
// load balancer status to Kubernetes. This means there is a short
// window between setting the annotation, and the service receving
// its load balancer configuration.
//
// To avoid races, we therefore have to check for the annotation,
// as well as the load balancer state.
if uuid != "" && len(service.Status.LoadBalancer.Ingress) > 0 {
return service
}
}
Expand Down Expand Up @@ -394,8 +402,9 @@ func (s *IntegrationTestSuite) TestServiceTrafficPolicyLocal() {
assertPrefix := func(addr string, prefix *netip.Prefix) {
url := fmt.Sprintf("http://%s", addr)
successful := 0
start := time.Now()

for i := 0; i < 60; i++ {
for i := 0; i < 120; i++ {
time.Sleep(1 * time.Second)

peer, err := testkit.HTTPRead(url)
Expand All @@ -419,7 +428,8 @@ func (s *IntegrationTestSuite) TestServiceTrafficPolicyLocal() {
}
}

s.Assert().GreaterOrEqual(successful, 15)
s.T().Logf("Took %s too %s to get ready", url, time.Since(start))
s.Require().GreaterOrEqual(successful, 15)
}

// Ensures the traffic is handled without unexpected delay
Expand Down
Loading