Influxdata
/
chronograf
mirror of https://github.com/influxdata/chronograf.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #533 from influxdata/fix-staticcheck-issues 

Fix problems found by https://github.com/dominikh/go-staticcheck
pull/534/head
Chris Goller 2016-11-14 11:13:51 -06:00 committed by GitHub
parent 654146ef35 40190028e3
commit d60a4eda95
5 changed files with 46 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bolt/exploration_test.go
View File

@ -1,6 +1,7 @@
package bolt_test
import (
"context"
"testing"
"github.com/influxdata/chronograf"
@ -36,15 +37,16 @@ func TestExplorationStore_CRUD(t *testing.T) {
},
}
ctx := context.Background()
// Add new explorations.
for i := range explorations {
if _, err := s.Add(nil, explorations[i]); err != nil {
if _, err := s.Add(ctx, explorations[i]); err != nil {
t.Fatal(err)
}
}
// Confirm first exploration in the store is the same as the original.
if e, err := s.Get(nil, explorations[0].ID); err != nil {
if e, err := s.Get(ctx, explorations[0].ID); err != nil {
t.Fatal(err)
} else if e.ID != explorations[0].ID {
t.Fatalf("exploration ID error: got %v, expected %v", e.ID, explorations[1].ID)
@ -59,31 +61,31 @@ func TestExplorationStore_CRUD(t *testing.T) {
// Update explorations.
explorations[1].Name = "Francis Drake"
explorations[2].UserID = 4
if err := s.Update(nil, explorations[1]); err != nil {
if err := s.Update(ctx, explorations[1]); err != nil {
t.Fatal(err)
} else if err := s.Update(nil, explorations[2]); err != nil {
} else if err := s.Update(ctx, explorations[2]); err != nil {
t.Fatal(err)
}
// Confirm explorations are updated.
if e, err := s.Get(nil, explorations[1].ID); err != nil {
if e, err := s.Get(ctx, explorations[1].ID); err != nil {
t.Fatal(err)
} else if e.Name != "Francis Drake" {
t.Fatalf("exploration 1 update error: got %v, expected %v", e.Name, "Francis Drake")
}
if e, err := s.Get(nil, explorations[2].ID); err != nil {
if e, err := s.Get(ctx, explorations[2].ID); err != nil {
t.Fatal(err)
} else if e.UserID != 4 {
t.Fatalf("exploration 2 update error: got %v, expected %v", e.UserID, 4)
}
// Delete an exploration.
if err := s.Delete(nil, explorations[2]); err != nil {
if err := s.Delete(ctx, explorations[2]); err != nil {
t.Fatal(err)
}
// Confirm exploration has been deleted.
if e, err := s.Get(nil, explorations[2].ID); err != chronograf.ErrExplorationNotFound {
if e, err := s.Get(ctx, explorations[2].ID); err != chronograf.ErrExplorationNotFound {
t.Fatalf("exploration delete error: got %v, expected %v", e, chronograf.ErrExplorationNotFound)
}
}
@ -118,15 +120,16 @@ func TestExplorationStore_Query(t *testing.T) {
},
}
ctx := context.Background()
// Add new explorations.
for i := range explorations {
if _, err := s.Add(nil, explorations[i]); err != nil {
if _, err := s.Add(ctx, explorations[i]); err != nil {
t.Fatal(err)
}
}
// Query for explorations.
if e, err := s.Query(nil, 3); err != nil {
if e, err := s.Query(ctx, 3); err != nil {
t.Fatal(err)
} else if len(e) != 2 {
t.Fatalf("exploration query length error: got %v, expected %v", len(explorations), len(e))

20
bolt/servers_test.go
View File

@ -1,6 +1,7 @@
package bolt_test
import (
"context"
"reflect"
"testing"
@ -37,12 +38,13 @@ func TestServerStore(t *testing.T) {
}
// Add new srcs.
ctx := context.Background()
for i, src := range srcs {
if srcs[i], err = s.Add(nil, src); err != nil {
if srcs[i], err = s.Add(ctx, src); err != nil {
t.Fatal(err)
}
// Confirm first src in the store is the same as the original.
if actual, err := s.Get(nil, srcs[i].ID); err != nil {
if actual, err := s.Get(ctx, srcs[i].ID); err != nil {
t.Fatal(err)
} else if !reflect.DeepEqual(actual, srcs[i]) {
t.Fatalf("server loaded is different then server saved; actual: %v, expected %v", actual, srcs[i])
@ -52,35 +54,35 @@ func TestServerStore(t *testing.T) {
// Update server.
srcs[0].Username = "calvinklein"
srcs[1].Name = "Enchantment Under the Sea Dance"
if err := s.Update(nil, srcs[0]); err != nil {
if err := s.Update(ctx, srcs[0]); err != nil {
t.Fatal(err)
} else if err := s.Update(nil, srcs[1]); err != nil {
} else if err := s.Update(ctx, srcs[1]); err != nil {
t.Fatal(err)
}
// Confirm servers have updated.
if src, err := s.Get(nil, srcs[0].ID); err != nil {
if src, err := s.Get(ctx, srcs[0].ID); err != nil {
t.Fatal(err)
} else if src.Username != "calvinklein" {
t.Fatalf("server 0 update error: got %v, expected %v", src.Username, "calvinklein")
}
if src, err := s.Get(nil, srcs[1].ID); err != nil {
if src, err := s.Get(ctx, srcs[1].ID); err != nil {
t.Fatal(err)
} else if src.Name != "Enchantment Under the Sea Dance" {
t.Fatalf("server 1 update error: got %v, expected %v", src.Name, "Enchantment Under the Sea Dance")
}
// Delete an server.
if err := s.Delete(nil, srcs[0]); err != nil {
if err := s.Delete(ctx, srcs[0]); err != nil {
t.Fatal(err)
}
// Confirm server has been deleted.
if _, err := s.Get(nil, srcs[0].ID); err != chronograf.ErrServerNotFound {
if _, err := s.Get(ctx, srcs[0].ID); err != chronograf.ErrServerNotFound {
t.Fatalf("server delete error: got %v, expected %v", err, chronograf.ErrServerNotFound)
}
if bsrcs, err := s.All(nil); err != nil {
if bsrcs, err := s.All(ctx); err != nil {
t.Fatal(err)
} else if len(bsrcs) != 1 {
t.Fatalf("After delete All returned incorrect number of srcs; got %d, expected %d", len(bsrcs), 1)

32
bolt/sources_test.go
View File

@ -1,6 +1,7 @@
package bolt_test
import (
"context"
"reflect"
"testing"
@ -39,13 +40,14 @@ func TestSourceStore(t *testing.T) {
},
}
ctx := context.Background()
// Add new srcs.
for i, src := range srcs {
if srcs[i], err = s.Add(nil, src); err != nil {
if srcs[i], err = s.Add(ctx, src); err != nil {
t.Fatal(err)
}
// Confirm first src in the store is the same as the original.
if actual, err := s.Get(nil, srcs[i].ID); err != nil {
if actual, err := s.Get(ctx, srcs[i].ID); err != nil {
t.Fatal(err)
} else if !reflect.DeepEqual(actual, srcs[i]) {
t.Fatalf("source loaded is different then source saved; actual: %v, expected %v", actual, srcs[i])
@ -59,12 +61,12 @@ func TestSourceStore(t *testing.T) {
mustUpdateSource(t, s, srcs[1])
// Confirm sources have updated.
if src, err := s.Get(nil, srcs[0].ID); err != nil {
if src, err := s.Get(ctx, srcs[0].ID); err != nil {
t.Fatal(err)
} else if src.Username != "calvinklein" {
t.Fatalf("source 0 update error: got %v, expected %v", src.Username, "calvinklein")
}
if src, err := s.Get(nil, srcs[1].ID); err != nil {
if src, err := s.Get(ctx, srcs[1].ID); err != nil {
t.Fatal(err)
} else if src.Name != "Enchantment Under the Sea Dance" {
t.Fatalf("source 1 update error: got %v, expected %v", src.Name, "Enchantment Under the Sea Dance")
@ -76,7 +78,7 @@ func TestSourceStore(t *testing.T) {
mustUpdateSource(t, s, srcs[0])
mustUpdateSource(t, s, srcs[1])
if actual, err := s.Get(nil, srcs[0].ID); err != nil {
if actual, err := s.Get(ctx, srcs[0].ID); err != nil {
t.Fatal(err)
} else if actual.Default == true {
t.Fatal("Able to set two default sources when only one should be permitted")
@ -93,7 +95,7 @@ func TestSourceStore(t *testing.T) {
})
srcs[2] = mustAddSource(t, s, srcs[2])
if srcs, err := s.All(nil); err != nil {
if srcs, err := s.All(ctx); err != nil {
t.Fatal(err)
} else {
defaults := 0
@ -109,21 +111,21 @@ func TestSourceStore(t *testing.T) {
}
// Delete an source.
if err := s.Delete(nil, srcs[0]); err != nil {
if err := s.Delete(ctx, srcs[0]); err != nil {
t.Fatal(err)
}
// Confirm source has been deleted.
if _, err := s.Get(nil, srcs[0].ID); err != chronograf.ErrSourceNotFound {
if _, err := s.Get(ctx, srcs[0].ID); err != chronograf.ErrSourceNotFound {
t.Fatalf("source delete error: got %v, expected %v", err, chronograf.ErrSourceNotFound)
}
// Delete the other source we created
if err := s.Delete(nil, srcs[2]); err != nil {
if err := s.Delete(ctx, srcs[2]); err != nil {
t.Fatal(err)
}
if bsrcs, err := s.All(nil); err != nil {
if bsrcs, err := s.All(ctx); err != nil {
t.Fatal(err)
} else if len(bsrcs) != 1 {
t.Fatalf("After delete All returned incorrect number of srcs; got %d, expected %d", len(bsrcs), 1)
@ -132,7 +134,7 @@ func TestSourceStore(t *testing.T) {
}
// Delete the final source
if err := s.Delete(nil, srcs[1]); err != nil {
if err := s.Delete(ctx, srcs[1]); err != nil {
t.Fatal(err)
}
@ -147,7 +149,7 @@ func TestSourceStore(t *testing.T) {
Default: false,
})
if actual, err := s.Get(nil, src.ID); err != nil {
if actual, err := s.Get(ctx, src.ID); err != nil {
t.Fatal(err)
} else if !actual.Default {
t.Fatal("Expected first source added to be default but wasn't")
@ -155,13 +157,15 @@ func TestSourceStore(t *testing.T) {
}
func mustUpdateSource(t *testing.T, s *bolt.SourcesStore, src chronograf.Source) {
if err := s.Update(nil, src); err != nil {
ctx := context.Background()
if err := s.Update(ctx, src); err != nil {
t.Fatal(err)
}
}
func mustAddSource(t *testing.T, s *bolt.SourcesStore, src chronograf.Source) chronograf.Source {
if src, err := s.Add(nil, src); err != nil {
ctx := context.Background()
if src, err := s.Add(ctx, src); err != nil {
t.Fatal(err)
return src
} else {

4
kapacitor/data.go
View File

@ -47,7 +47,9 @@ func Data(rule chronograf.AlertRule) (string, error) {
value = value + fmt.Sprintf(`|%s('%s').as('value')`, fnc, fld)
break // only support a single field
}
break // only support a single field
if value != "" {
break // only support a single field
}
}
if value == "" {
value = fmt.Sprintf(`|eval(lambda: "%s").as('value')`, fld)

2
kapacitor/data_test.go
View File

@ -52,7 +52,7 @@ func TestData(t *testing.T) {
} else {
_, err := formatTick(tick)
if err != nil {
fmt.Printf(tick)
fmt.Print(tick)
t.Errorf("Error formatting tick %v", err)
}
}