Skip to content

Commit

Permalink
Merge pull request #2425 from influxdata/dm-context-no-nil-parent-2424
Browse files Browse the repository at this point in the history 
test: use non-nil parent context in tests to avoid panics
  • Loading branch information
@danxmoran
danxmoran authored Nov 3, 2020
2 parents 0cb75d8 + c2e2ded commit d96b023
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions integrations/streamer_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11187,7 +11187,7 @@ func TestStream_Autoscale(t *testing.T) {
},
setup: func(tm *kapacitor.TaskMaster) context.Context {
scaleUpdates := make(chan k8s.Scale, 100)
ctx := context.WithValue(nil, "updates", scaleUpdates)
ctx := context.WithValue(context.Background(), "updates", scaleUpdates)
k8sAutoscale := k8stest.Client{}
k8sAutoscale.ScalesGetFunc = func(kind, name string) (*k8s.Scale, error) {
var replicas int32
Expand Down Expand Up @@ -11283,7 +11283,7 @@ func TestStream_Autoscale(t *testing.T) {
},
setup: func(tm *kapacitor.TaskMaster) context.Context {
serviceUpdates := make(chan swarm.Service, 100)
ctx := context.WithValue(nil, "updates", serviceUpdates)
ctx := context.WithValue(context.Background(), "updates", serviceUpdates)
swarmAutoscale := swarmtest.Client{}
swarmAutoscale.ServiceFunc = func(name string) (*swarm.Service, error) {
var replicas uint64
Expand Down
50 changes: 25 additions & 25 deletions server/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9765,7 +9765,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := alertatest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Alerta.Enabled = true
c.Alerta.URL = ts.URL
Expand Down Expand Up @@ -9806,7 +9806,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := discordtest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Discord[0].Enabled = true
c.Discord[0].URL = ts.URL + "/test/discord/url"
Expand Down Expand Up @@ -9847,7 +9847,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
te := alerttest.NewExec()
ctxt := context.WithValue(nil, "exec", te)
ctxt := context.WithValue(context.Background(), "exec", te)
c.Commander = te.Commander
return ctxt, nil
},
Expand Down Expand Up @@ -9885,7 +9885,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := hipchattest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.HipChat.Enabled = true
c.HipChat.URL = ts.URL
Expand Down Expand Up @@ -9923,7 +9923,7 @@ func TestServer_AlertHandlers(t *testing.T) {
if err != nil {
return nil, err
}
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Kafka = kafka.Configs{{
Enabled: true,
Expand Down Expand Up @@ -9982,7 +9982,7 @@ func TestServer_AlertHandlers(t *testing.T) {

l := alerttest.NewLog(p)

ctxt := context.WithValue(nil, "tdir", tdir)
ctxt := context.WithValue(context.Background(), "tdir", tdir)
ctxt = context.WithValue(ctxt, "log", l)
return ctxt, nil
},
Expand Down Expand Up @@ -10021,7 +10021,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
cc := new(mqtttest.ClientCreator)
ctxt := context.WithValue(nil, "clientCreator", cc)
ctxt := context.WithValue(context.Background(), "clientCreator", cc)
cfg := &mqtt.Config{
Enabled: true,
Name: "test",
Expand Down Expand Up @@ -10068,7 +10068,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
cc := new(mqtttest.ClientCreator)
ctxt := context.WithValue(nil, "clientCreator", cc)
ctxt := context.WithValue(context.Background(), "clientCreator", cc)
cfg := &mqtt.Config{
Enabled: true,
Name: "test",
Expand Down Expand Up @@ -10114,7 +10114,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := opsgenietest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.OpsGenie.Enabled = true
c.OpsGenie.URL = ts.URL
Expand Down Expand Up @@ -10158,7 +10158,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := opsgenie2test.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.OpsGenie2.Enabled = true
c.OpsGenie2.URL = ts.URL
Expand Down Expand Up @@ -10208,7 +10208,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := pagerdutytest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.PagerDuty.Enabled = true
c.PagerDuty.URL = ts.URL
Expand Down Expand Up @@ -10255,7 +10255,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := pagerduty2test.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.PagerDuty2.Enabled = true
c.PagerDuty2.URL = ts.URL
Expand Down Expand Up @@ -10317,7 +10317,7 @@ func TestServer_AlertHandlers(t *testing.T) {

ha.Options = map[string]interface{}{"url": ts.URL}

ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)
return ctxt, nil
},
result: func(ctxt context.Context) error {
Expand All @@ -10340,7 +10340,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := httpposttest.NewAlertServer(nil, true)
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)
c.HTTPPost = httppost.Configs{{
Endpoint: "test",
URLTemplate: ts.URL,
Expand Down Expand Up @@ -10368,7 +10368,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := pushovertest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Pushover.Enabled = true
c.Pushover.URL = ts.URL
Expand Down Expand Up @@ -10410,7 +10410,7 @@ func TestServer_AlertHandlers(t *testing.T) {
if err != nil {
return nil, err
}
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Sensu.Enabled = true
c.Sensu.Addr = ts.Addr
Expand Down Expand Up @@ -10446,7 +10446,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := servicenowtest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.ServiceNow.Enabled = true
c.ServiceNow.URL = ts.URL
Expand Down Expand Up @@ -10481,7 +10481,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := slacktest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Slack[0].Enabled = true
c.Slack[0].URL = ts.URL + "/test/slack/url"
Expand Down Expand Up @@ -10525,7 +10525,7 @@ func TestServer_AlertHandlers(t *testing.T) {
if err != nil {
return nil, err
}
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.SMTP.Enabled = true
c.SMTP.Host = ts.Host
Expand Down Expand Up @@ -10590,7 +10590,7 @@ func TestServer_AlertHandlers(t *testing.T) {
if err != nil {
return nil, err
}
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.SNMPTrap.Enabled = true
c.SNMPTrap.Addr = ts.Addr
Expand Down Expand Up @@ -10642,7 +10642,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := talktest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Talk.Enabled = true
c.Talk.URL = ts.URL
Expand Down Expand Up @@ -10679,7 +10679,7 @@ func TestServer_AlertHandlers(t *testing.T) {

ha.Options = map[string]interface{}{"address": ts.Addr}

ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)
return ctxt, nil
},
result: func(ctxt context.Context) error {
Expand All @@ -10699,7 +10699,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := teamstest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Teams.Enabled = true
c.Teams.ChannelURL = ts.URL
Expand Down Expand Up @@ -10735,7 +10735,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := telegramtest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.Telegram.Enabled = true
c.Telegram.URL = ts.URL + "/bot"
Expand Down Expand Up @@ -10771,7 +10771,7 @@ func TestServer_AlertHandlers(t *testing.T) {
},
setup: func(c *server.Config, ha *client.TopicHandler) (context.Context, error) {
ts := victoropstest.NewServer()
ctxt := context.WithValue(nil, "server", ts)
ctxt := context.WithValue(context.Background(), "server", ts)

c.VictorOps.Enabled = true
c.VictorOps.URL = ts.URL
Expand Down

0 comments on commit d96b023

Please sign in to comment.