From a4f10c171ec71eccadc17ef04ef87a38c64eb49c Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 12 Oct 2020 16:25:49 +0200 Subject: [PATCH 1/2] Test DB Startup timeout 60s => 90s Signed-off-by: Guillaume Tardif --- tests/aci-e2e/e2e-aci_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index 8354c47c..a177060e 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -796,7 +796,7 @@ func TestRunEnvVars(t *testing.T) { } return poll.Continue("waiting for DB container to be up") } - poll.WaitOn(t, check, poll.WithDelay(5*time.Second), poll.WithTimeout(60*time.Second)) + poll.WaitOn(t, check, poll.WithDelay(5*time.Second), poll.WithTimeout(90*time.Second)) }) } From 7b8255c953b9aa01eb334a1ee3bb9ec9ebac3727 Mon Sep 17 00:00:00 2001 From: Guillaume Tardif Date: Mon, 12 Oct 2020 15:51:48 +0200 Subject: [PATCH 2/2] Replaces windows carriage return for windows tests Signed-off-by: Guillaume Tardif --- tests/aci-e2e/e2e-aci_test.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/aci-e2e/e2e-aci_test.go b/tests/aci-e2e/e2e-aci_test.go index a177060e..352c76bf 100644 --- a/tests/aci-e2e/e2e-aci_test.go +++ b/tests/aci-e2e/e2e-aci_test.go @@ -563,9 +563,12 @@ func TestUpSecrets(t *testing.T) { endpoint := fmt.Sprintf("http://%s:%d", containerInspect.Ports[0].HostIP, containerInspect.Ports[0].HostPort) output := HTTPGetWithRetry(t, endpoint+"/"+secret1Name, http.StatusOK, 2*time.Second, 20*time.Second) + // replace windows carriage return + output = strings.ReplaceAll(output, "\r", "") assert.Equal(t, output, secret1Value) output = HTTPGetWithRetry(t, endpoint+"/"+secret2Name, http.StatusOK, 2*time.Second, 20*time.Second) + output = strings.ReplaceAll(output, "\r", "") assert.Equal(t, output, secret2Value) t.Cleanup(func() {