Commit c366ddc0 authored by Jacob Vosmaer (GitLab)'s avatar Jacob Vosmaer (GitLab)

Merge branch 'go-1-10-fix' into 'master'

Run tests against Go 1.10 and fix a bug exposed by doing so

See merge request gitlab-org/gitlab-workhorse!251
parents 50eeaa4f c2fd3317
...@@ -13,6 +13,10 @@ test using go 1.9: ...@@ -13,6 +13,10 @@ test using go 1.9:
image: golang:1.9 image: golang:1.9
<<: *test_definition <<: *test_definition
test using go 1.10:
image: golang:1.10
<<: *test_definition
test:release: test:release:
only: only:
- tags - tags
......
...@@ -85,7 +85,7 @@ func TestComplainingWriterSanity(t *testing.T) { ...@@ -85,7 +85,7 @@ func TestComplainingWriterSanity(t *testing.T) {
w.CheerUp() w.CheerUp()
if _, err := io.Copy(w, testReader(testData)); err != nil { if _, err := io.Copy(w, testReader(testData)); err != nil {
t.Error("copy after CheerUp: %v", err) t.Errorf("copy after CheerUp: %v", err)
} }
if result := recorder.String(); result != testData { if result := recorder.String(); result != testData {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment