Skip to content

Commit 95ab80a

Browse files
committed
empty body check in test
1 parent 4af9f56 commit 95ab80a

File tree

2 files changed

+9
-6
lines changed

2 files changed

+9
-6
lines changed

plugins/inputs/influxdb_v2_listener/influxdb_v2_listener.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ type InfluxDBV2Listener struct {
7676
readysServed selfstat.Stat
7777
requestsRecv selfstat.Stat
7878
notFoundsServed selfstat.Stat
79-
pingServed selfstat.Stat
79+
pingsServed selfstat.Stat
8080

8181
authFailures selfstat.Stat
8282

@@ -230,8 +230,8 @@ func (h *InfluxDBV2Listener) routes() error {
230230
h.mux.Handle("/api/v2/ready", h.handleReady())
231231
h.mux.Handle("/health", h.handleHealth())
232232
h.mux.Handle("/ready", h.handleReady())
233-
h.mux.Handle("/", authHandler(h.handleDefault()))
234233
h.mux.Handle("/ping", h.handlePing())
234+
h.mux.Handle("/", authHandler(h.handleDefault()))
235235

236236
return nil
237237
}
@@ -299,7 +299,7 @@ func (h *InfluxDBV2Listener) handleDefault() http.HandlerFunc {
299299

300300
func (h *InfluxDBV2Listener) handlePing() http.HandlerFunc {
301301
return func(res http.ResponseWriter, _ *http.Request) {
302-
defer h.pingServed.Incr(1)
302+
defer h.pingsServed.Incr(1)
303303
res.Header().Set("X-Influxdb-Build", "telegraf")
304304
res.Header().Set("X-Influxdb-Version", internal.FormatFullVersion())
305305
res.WriteHeader(http.StatusNoContent)

plugins/inputs/influxdb_v2_listener/influxdb_v2_listener_test.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,10 +594,13 @@ func TestPing(t *testing.T) {
594594
resp, err := http.Get(createURL(listener, "http", "/ping", ""))
595595
require.NoError(t, err)
596596
require.EqualValues(t, 204, resp.StatusCode)
597-
require.NoError(t, resp.Body.Close())
598-
require.EqualValues(t, 1, listener.pingServed.Get())
599597
require.EqualValues(t, internal.FormatFullVersion(), resp.Header.Get("X-Influxdb-Version"))
600-
require.EqualValues(t, "Telegraf", resp.Header.Get("X-Influxdb-Build"))
598+
require.EqualValues(t, "telegraf", resp.Header.Get("X-Influxdb-Build"))
599+
require.EqualValues(t, 1, listener.pingsServed.Get())
600+
bodyBytes, err := io.ReadAll(resp.Body)
601+
require.NoError(t, err)
602+
require.NoError(t, resp.Body.Close())
603+
require.Equal(t, 0, len(bodyBytes))
601604
}
602605

603606
func TestReady(t *testing.T) {

0 commit comments

Comments
 (0)