Fix race conditions

Signed-off-by: Ulysses Souza <[email protected]>

Author: ulyssessouza

compliance_test.go

@@ -133,7 +133,7 @@ func TestUdpPort(t *testing.T) {
 		buf := []byte(fmt.Sprintf("{\"request\":%q}", udpValue))
 		_, err = Conn.Write(buf)
 		assert.NilError(h.T, err)
-
+		time.Sleep(time.Second) // Wait for the registration
 		actual := h.getHttpBody(udpEntrypoint)
 		expected := jsonResponse(udpValue)
 		h.Check(expected, actual)
@@ -148,10 +148,11 @@ func TestScaling(t *testing.T) {
 		specRef:      "Networks-top-level-element",
 	}
 	h.TestUpDown(func() {
+		time.Sleep(2 * time.Second) // Wait so the clients can register
 		actual := h.getHttpBody(scaleEntrypoint)
 		responseArray := Response{}
 		err := yaml.Unmarshal([]byte(actual), &responseArray)
 		assert.NilError(h.T, err)
-		h.Check(responseArray.Response, "3")
+		h.Check("3", responseArray.Response)
 	})
 }

tests_helper.go

@@ -8,15 +8,17 @@ import (
 	"path/filepath"
 	"strings"
 	"testing"
+	"time"
 
 	"gopkg.in/yaml.v2"
 	"gotest.tools/v3/assert"
 	"gotest.tools/v3/icmd"
 )
 
 const (
-	commandsDir       = "commands"
-	baseSpecReference = "https://github.com/compose-spec/compose-spec/blob/master/spec.md"
+	commandsDir           = "commands"
+	baseSpecReference     = "https://github.com/compose-spec/compose-spec/blob/master/spec.md"
+	defaultHealthCheckUrl = "http://127.0.0.1:8080/ping"
 )
 
 type Config struct {
@@ -61,13 +63,24 @@ func (h TestHelper) TestUpDown(fun func()) {
 				}
 			}
 			h.executeUp(c)
+			h.waitHttpReady(defaultHealthCheckUrl, 5*time.Second)
 			fun()
 			h.executeDown(c)
 			h.checkCleanUp(c)
 		})
 	}
 }
 
+func (h TestHelper) waitHttpReady(url string, timeout time.Duration) {
+	limit := time.Now().Add(timeout)
+	for limit.After(time.Now()) {
+		resp, err := http.Get(url)
+		if err == nil && resp.StatusCode == http.StatusOK {
+			return
+		}
+	}
+}
+
 func (h TestHelper) Check(expected, actual string) {
 	assert.Check(h.T, expected == actual, h.assertSpecReferenceMessage(expected, actual))
 }