Skip to content

test: bump main test timeout to 20s #284

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

Merged
merged 1 commit into from
Aug 23, 2022
Merged

test: bump main test timeout to 20s #284

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
28 changes: 15 additions & 13 deletions main_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ type ApmInfo struct {
Version string `json:"version"`
}

const timeout = 20 * time.Second

func newMockApmServer(t *testing.T, l *zap.SugaredLogger) (*MockServerInternals, *httptest.Server) {
var apmServerInternals MockServerInternals
apmServerInternals.WaitForUnlockSignal = true
Expand Down Expand Up @@ -398,7 +400,7 @@ func TestStandardEventsChain(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, apmServerInternals.Data, TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -420,7 +422,7 @@ func TestFlush(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, apmServerInternals.Data, TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -444,7 +446,7 @@ func TestLateFlush(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, apmServerInternals.Data, TimelyResponse+TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -466,7 +468,7 @@ func TestWaitGroup(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, apmServerInternals.Data, TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -489,7 +491,7 @@ func TestAPMServerDown(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.NotContains(t, apmServerInternals.Data, TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -512,7 +514,7 @@ func TestAPMServerHangs(t *testing.T) {
case <-runApp(t, logsapiAddr):
assert.NotContains(t, apmServerInternals.Data, Hangs)
apmServerInternals.UnlockSignalChannel <- struct{}{}
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand Down Expand Up @@ -569,7 +571,7 @@ func TestGracePeriodHangs(t *testing.T) {
case <-runApp(t, logsapiAddr):
time.Sleep(100 * time.Millisecond)
apmServerInternals.UnlockSignalChannel <- struct{}{}
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}

Expand Down Expand Up @@ -619,7 +621,7 @@ func TestFullChannel(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, apmServerInternals.Data, TimelyResponse)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -646,7 +648,7 @@ func TestFullChannelSlowAPMServer(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
// The test should not hang
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -668,7 +670,7 @@ func TestInfoRequest(t *testing.T) {
select {
case <-runApp(t, logsapiAddr):
assert.Contains(t, lambdaServerInternals.Data, "7814d524d3602e70b703539c57568cba6964fc20")
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand All @@ -692,7 +694,7 @@ func TestInfoRequestHangs(t *testing.T) {
time.Sleep(2 * time.Second)
assert.NotContains(t, lambdaServerInternals.Data, "7814d524d3602e70b703539c57568cba6964fc20")
apmServerInternals.UnlockSignalChannel <- struct{}{}
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand Down Expand Up @@ -725,7 +727,7 @@ func TestMetricsWithoutMetadata(t *testing.T) {
assert.Contains(t, apmServerInternals.Data, `coldstart":true`)
assert.Contains(t, apmServerInternals.Data, `execution":`)
assert.Contains(t, apmServerInternals.Data, `id":"arn:aws:lambda:eu-central-1:627286350134:function:main_unit_test"`)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand Down Expand Up @@ -757,7 +759,7 @@ func TestMetricsWithMetadata(t *testing.T) {
assert.Contains(t, apmServerInternals.Data, `coldstart":true`)
assert.Contains(t, apmServerInternals.Data, `execution"`)
assert.Contains(t, apmServerInternals.Data, `id":"arn:aws:lambda:eu-central-1:627286350134:function:main_unit_test"`)
case <-time.After(5 * time.Second):
case <-time.After(timeout):
t.Fatalf("timed out waiting for app to finish")
}
}
Expand Down