Skip to content

Bump Go versions #292

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 26, 2018
Merged

Bump Go versions #292

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb73258
Bump Go versions
HaraldNordgren Oct 21, 2018
c1af789
Fix linter failures
HaraldNordgren Oct 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
language: go
go:
- 1.9
- "1.9"
- "1.10"
- "1.11"
install:
- make get-deps
script:
Expand Down
8 changes: 4 additions & 4 deletions template_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestKeysEmpty(t *testing.T) {
}

if len(input) != vk.Len() {
t.Fatalf("Incorrect key count; expected %s, got %s", len(input), vk.Len())
t.Fatalf("Incorrect key count; expected %d, got %d", len(input), vk.Len())
}
}

Expand Down Expand Up @@ -269,11 +269,11 @@ func TestGroupByMulti(t *testing.T) {
}

if len(groups["demo1.localhost"]) != 2 {
t.Fatalf("expected 2 got %s", len(groups["demo1.localhost"]))
t.Fatalf("expected 2 got %d", len(groups["demo1.localhost"]))
}

if len(groups["demo2.localhost"]) != 1 {
t.Fatalf("expected 1 got %s", len(groups["demo2.localhost"]))
t.Fatalf("expected 1 got %d", len(groups["demo2.localhost"]))
}
if groups["demo2.localhost"][0].(RuntimeContainer).ID != "3" {
t.Fatalf("expected 2 got %s", groups["demo2.localhost"][0].(RuntimeContainer).ID)
Expand Down Expand Up @@ -785,7 +785,7 @@ func TestJson(t *testing.T) {
t.Fatal(err)
}
if len(decoded) != len(containers) {
t.Fatal("Incorrect unmarshaled container count. Expected %d, got %d.", len(containers), len(decoded))
t.Fatalf("Incorrect unmarshaled container count. Expected %d, got %d.", len(containers), len(decoded))
}
}

Expand Down
4 changes: 2 additions & 2 deletions utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func TestDockerHostEndpoint(t *testing.T) {

endpoint, err := GetEndpoint("")
if err != nil {
t.Fatal("%s", err)
t.Fatalf("%s", err)
}

if endpoint != "tcp://127.0.0.1:4243" {
Expand All @@ -48,7 +48,7 @@ func TestDockerFlagEndpoint(t *testing.T) {
// flag value should override DOCKER_HOST and default value
endpoint, err := GetEndpoint("tcp://127.0.0.1:5555")
if err != nil {
t.Fatal("%s", err)
t.Fatalf("%s", err)
}
if endpoint != "tcp://127.0.0.1:5555" {
t.Fatalf("Expected tcp://127.0.0.1:5555, got %s", endpoint)
Expand Down