Skip to content
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

Jump to bottom

chore: fix nginx request failures in tests #2723

Merged
merged 1 commit into from
Aug 13, 2024
Merged

chore: fix nginx request failures in tests #2723

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
13 changes: 7 additions & 6 deletions docker_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ func TestContainerWithHostNetworkOptions(t *testing.T) {
nginxHighPort,
},
Privileged: true,
WaitingFor: wait.ForListeningPort(nginxHighPort),
WaitingFor: wait.ForHTTP("/").WithPort(nginxHighPort),
HostConfigModifier: func(hc *container.HostConfig) {
hc.NetworkMode = "host"
},
Expand Down Expand Up @@ -182,7 +182,7 @@ func TestContainerWithHostNetwork(t *testing.T) {
ProviderType: providerType,
ContainerRequest: ContainerRequest{
Image: nginxAlpineImage,
WaitingFor: wait.ForListeningPort(nginxHighPort),
WaitingFor: wait.ForHTTP("/").WithPort(nginxHighPort),
Files: []ContainerFile{
{
HostFilePath: absPath,
Expand Down Expand Up @@ -414,6 +414,7 @@ func TestTwoContainersExposingTheSamePort(t *testing.T) {
ExposedPorts: []string{
nginxDefaultPort,
},
WaitingFor: wait.ForHTTP("/").WithPort(nginxDefaultPort),
},
Started: true,
})
Expand All @@ -428,7 +429,7 @@ func TestTwoContainersExposingTheSamePort(t *testing.T) {
ExposedPorts: []string{
nginxDefaultPort,
},
WaitingFor: wait.ForListeningPort(nginxDefaultPort),
WaitingFor: wait.ForHTTP("/").WithPort(nginxDefaultPort),
},
Started: true,
})
Expand Down Expand Up @@ -475,7 +476,7 @@ func TestContainerCreation(t *testing.T) {
ExposedPorts: []string{
nginxDefaultPort,
},
WaitingFor: wait.ForListeningPort(nginxDefaultPort),
WaitingFor: wait.ForHTTP("/").WithPort(nginxDefaultPort),
},
Started: true,
})
Expand Down Expand Up @@ -529,7 +530,7 @@ func TestContainerCreationWithName(t *testing.T) {
ExposedPorts: []string{
nginxDefaultPort,
},
WaitingFor: wait.ForListeningPort(nginxDefaultPort),
WaitingFor: wait.ForHTTP("/").WithPort(nginxDefaultPort),
Name: creationName,
Networks: []string{"bridge"},
},
Expand Down Expand Up @@ -592,7 +593,7 @@ func TestContainerCreationAndWaitForListeningPortLongEnough(t *testing.T) {
ExposedPorts: []string{
nginxDefaultPort,
},
WaitingFor: wait.ForListeningPort(nginxDefaultPort), // default startupTimeout is 60s
WaitingFor: wait.ForHTTP("/").WithPort(nginxDefaultPort), // default startupTimeout is 60s
},
Started: true,
})
Expand Down