CL-Softwares
/
telegraf
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Run all Go tests with flag -race (#7783)

This commit is contained in:
Steven Soroka 2020-07-07 15:14:00 -04:00 committed by GitHub
parent 898239d15d c116f0d039
commit 876fc5b4bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -50,6 +50,12 @@ ifneq ($(tag),)
LDFLAGS += -X main.version=$(version) LDFLAGS += -X main.version=$(version)
endif endif
# Go built-in race detector works only for 64 bits architectures.
ifneq ($(GOARCH), 386)
race_detector := -race
endif
GOFILES ?= $(shell git ls-files '*.go') GOFILES ?= $(shell git ls-files '*.go')
GOFMT ?= $(shell gofmt -l -s $(filter-out plugins/parsers/influx/machine.go, $(GOFILES))) GOFMT ?= $(shell gofmt -l -s $(filter-out plugins/parsers/influx/machine.go, $(GOFILES)))
@ -89,7 +95,7 @@ telegraf:
.PHONY: test .PHONY: test
test: test:
go test -short ./... go test -short $(race_detector) ./...
.PHONY: fmt .PHONY: fmt
fmt: fmt:
@ -107,12 +113,12 @@ fmtcheck:
.PHONY: test-windows .PHONY: test-windows
test-windows: test-windows:
go test -short ./plugins/inputs/ping/... go test -short $(race_detector) ./plugins/inputs/ping/...
go test -short ./plugins/inputs/win_perf_counters/... go test -short $(race_detector) ./plugins/inputs/win_perf_counters/...
go test -short ./plugins/inputs/win_services/... go test -short $(race_detector) ./plugins/inputs/win_services/...
go test -short ./plugins/inputs/procstat/... go test -short $(race_detector) ./plugins/inputs/procstat/...
go test -short ./plugins/inputs/ntpq/... go test -short $(race_detector) ./plugins/inputs/ntpq/...
go test -short ./plugins/processors/port_name/... go test -short $(race_detector) ./plugins/processors/port_name/...
.PHONY: vet .PHONY: vet
vet: vet:
@ -139,7 +145,7 @@ check: fmtcheck vet
.PHONY: test-all .PHONY: test-all
test-all: fmtcheck vet test-all: fmtcheck vet
go test ./... go test $(race_detector) ./...
.PHONY: check-deps .PHONY: check-deps
check-deps: check-deps:

4
plugins/inputs/ping/ping_windows.go
View File

@ -13,10 +13,6 @@ import (
) )
func (p *Ping) pingToURL(u string, acc telegraf.Accumulator) { func (p *Ping) pingToURL(u string, acc telegraf.Accumulator) {
if p.Count < 1 {
p.Count = 1
}
tags := map[string]string{"url": u} tags := map[string]string{"url": u}
fields := map[string]interface{}{"result_code": 0} fields := map[string]interface{}{"result_code": 0}