Skip to content

[backport 3.26] ROX-37266: wait for plop server instead of fixed sleep (#4045) #4064

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

Open
sachaudh wants to merge 1 commit into
base: release-3.26
Choose a base branch
from
+20 −3
Open

[backport 3.26] ROX-37266: wait for plop server instead of fixed sleep (#4045) #4064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 20 additions & 3 deletions integration-tests/suites/listening_ports.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package suites
import (
"fmt"
"io"
"net"
"net/http"
"sort"
"time"
Expand Down Expand Up @@ -57,10 +58,12 @@ func (s *ProcessListeningOnPortTestSuite) SetupSuite() {
ports, err := s.getPorts(serverName)
s.Require().NoError(err)

s.serverURL = fmt.Sprintf("http://%s:%d", ip, ports[0])
serverAddr := net.JoinHostPort(ip, fmt.Sprint(ports[0]))
s.serverURL = "http://" + serverAddr

// Wait 5 seconds for the plop service to start
common.Sleep(5 * time.Second)
// Flask usually binds within a few seconds, but a cold start on some
// VMs (e.g. ubuntu-2404) has been seen to take longer than that.
s.waitForServer(serverAddr, 15*time.Second)

log.Info("Opening ports...")
s.openPort(8081)
Expand Down Expand Up @@ -146,6 +149,20 @@ func getProcessListeningOnPortsImage() string {
return config.Images().QaImageByKey("qa-plop")
}

// waitForServer polls until the plop server accepts TCP connections on addr,
// failing the suite if it doesn't within timeout.
func (s *ProcessListeningOnPortTestSuite) waitForServer(addr string, timeout time.Duration) {
log.Info("Waiting for plop server on %s...", addr)
s.Require().Eventually(func() bool {
conn, err := net.DialTimeout("tcp", addr, time.Second)
if err != nil {
return false
}
conn.Close()
return true
}, timeout, 500*time.Millisecond, "plop server did not start listening on %s within %s", addr, timeout)
}

func (s *ProcessListeningOnPortTestSuite) openPort(port uint16) {
res, err := http.Get(fmt.Sprintf("%s/open/%d", s.serverURL, port))
s.Require().NoError(err)
Expand Down
Loading