Merge pull request #462 from prometheus/beorn7/testing

Add Go 1.11
This commit is contained in:
Björn Rabenstein 2018-09-19 13:43:04 +02:00 committed by GitHub
commit 73edb9af66
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 2 deletions

View File

@ -6,7 +6,8 @@ go:
- 1.8.x - 1.8.x
- 1.9.x - 1.9.x
- 1.10.x - 1.10.x
- 1.11.x
script: script:
- make check_license style unused test-short - make check_license style unused test-short
- if [[ ! $TRAVIS_GO_VERSION =~ ^1\.(7|8)\.[x0-9]+$ ]]; then make staticcheck; fi - if [[ ! $TRAVIS_GO_VERSION =~ ^1\.(7|8|9)\.[x0-9]+$ ]]; then make staticcheck; fi

View File

@ -13,6 +13,13 @@
include Makefile.common include Makefile.common
# http.CloseNotifier is deprecated but we don't want to remove support
# from client_golang to not break anybody still using it.
STATICCHECK_IGNORE = \
github.com/prometheus/client_golang/prometheus/promhttp/delegator*.go:SA1019 \
github.com/prometheus/client_golang/prometheus/promhttp/instrument_server_test.go:SA1019 \
github.com/prometheus/client_golang/prometheus/http.go:SA1019
.PHONY: get_dep .PHONY: get_dep
get_dep: get_dep:
@echo ">> getting dependencies" @echo ">> getting dependencies"

View File

@ -671,7 +671,7 @@ collected metric named "complex_count" collides with previously collected histog
handler(writer, request) handler(writer, request)
for key, value := range scenario.out.headers { for key, value := range scenario.out.headers {
if writer.HeaderMap.Get(key) != value { if writer.Header().Get(key) != value {
t.Errorf( t.Errorf(
"%d. expected %q for header %q, got %q", "%d. expected %q for header %q, got %q",
i, value, key, writer.Header().Get(key), i, value, key, writer.Header().Get(key),