tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 05:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #763 from docker/fiw_windows_tests_secrets

Browse Source 
Trim line returns for windows tests
This commit is contained in:
Guillaume Tardif 2020-10-13 08:45:32 +02:00 committed by GitHub
commit a6e06342d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/aci-e2e/e2e-aci_test.go
View File

@ -563,9 +563,12 @@ func TestUpSecrets(t *testing.T) {
endpoint := fmt.Sprintf("http://%s:%d", containerInspect.Ports[0].HostIP, containerInspect.Ports[0].HostPort) 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) 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) assert.Equal(t, output, secret1Value)
output = HTTPGetWithRetry(t, endpoint+"/"+secret2Name, http.StatusOK, 2*time.Second, 20*time.Second) output = HTTPGetWithRetry(t, endpoint+"/"+secret2Name, http.StatusOK, 2*time.Second, 20*time.Second)
output = strings.ReplaceAll(output, "\r", "")
assert.Equal(t, output, secret2Value) assert.Equal(t, output, secret2Value)
t.Cleanup(func() { t.Cleanup(func() {
@ -796,7 +799,7 @@ func TestRunEnvVars(t *testing.T) {
} }
return poll.Continue("waiting for DB container to be up") 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))
}) })
} }