diff --git a/Makefile b/Makefile index f58c16c7c..35d2ff7b0 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ SYSTEM:= CHECKS:=check godeps VERBOSE:=-v GOPATH?=$(HOME)/go -PRESUBMIT:=core coremain plugin +PRESUBMIT:=core coremain plugin test request all: coredns diff --git a/request/request.go b/request/request.go index 64504e6b4..ac6e9866c 100644 --- a/request/request.go +++ b/request/request.go @@ -2,13 +2,13 @@ package request import ( + "context" "net" "strings" "github.com/coredns/coredns/plugin/pkg/edns" "github.com/miekg/dns" - "golang.org/x/net/context" ) // Request contains some connection state and is useful in plugin. diff --git a/test/cache_test.go b/test/cache_test.go index 37aa55368..6271d5c14 100644 --- a/test/cache_test.go +++ b/test/cache_test.go @@ -14,7 +14,7 @@ func TestLookupCache(t *testing.T) { // Start auth. CoreDNS holding the auth zone. name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() diff --git a/test/ds_file_test.go b/test/ds_file_test.go index 8d342dab1..356fd2b0b 100644 --- a/test/ds_file_test.go +++ b/test/ds_file_test.go @@ -34,7 +34,7 @@ func TestLookupDS(t *testing.T) { t.Parallel() name, rm, err := TempFile(".", miekNL) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() diff --git a/test/etcd_cache_test.go b/test/etcd_cache_test.go index 361f4c78a..a0be86dc7 100644 --- a/test/etcd_cache_test.go +++ b/test/etcd_cache_test.go @@ -3,6 +3,7 @@ package test import ( + "context" "io/ioutil" "log" "testing" @@ -13,7 +14,6 @@ import ( "github.com/coredns/coredns/request" "github.com/miekg/dns" - "golang.org/x/net/context" ) // uses some stuff from etcd_tests.go diff --git a/test/etcd_test.go b/test/etcd_test.go index fcd1ddced..da9992a0d 100644 --- a/test/etcd_test.go +++ b/test/etcd_test.go @@ -3,6 +3,7 @@ package test import ( + "context" "encoding/json" "io/ioutil" "log" @@ -17,7 +18,6 @@ import ( etcdc "github.com/coreos/etcd/client" "github.com/miekg/dns" - "golang.org/x/net/context" ) func etcdPlugin() *etcd.Etcd { diff --git a/test/external_test.go b/test/external_test.go index 86799e320..f5737e17b 100644 --- a/test/external_test.go +++ b/test/external_test.go @@ -36,7 +36,7 @@ func testExternalPluginCompile(t *testing.T) { } if !strings.Contains(string(out), "dns.example") { - t.Fatal("dns.example plugin should be there") + t.Fatal("Plugin dns.example should be there") } } @@ -44,7 +44,7 @@ func run(t *testing.T, c *exec.Cmd) ([]byte, error) { c.Dir = ".." out, err := c.Output() if err != nil { - return nil, fmt.Errorf("run: failed to run %s %s: %q", c.Args[0], c.Args[1], err) + return nil, fmt.Errorf("Run: failed to run %s %s: %q", c.Args[0], c.Args[1], err) } return out, nil diff --git a/test/file_test.go b/test/file_test.go index d4167e38e..891e9d903 100644 --- a/test/file_test.go +++ b/test/file_test.go @@ -6,7 +6,7 @@ func TestTempFile(t *testing.T) { t.Parallel() _, f, e := TempFile(".", "test") if e != nil { - t.Fatalf("failed to create temp file: %s", e) + t.Fatalf("Failed to create temp file: %s", e) } defer f() } diff --git a/test/grpc_test.go b/test/grpc_test.go index 50d1643fb..acbd822d7 100644 --- a/test/grpc_test.go +++ b/test/grpc_test.go @@ -1,13 +1,13 @@ package test import ( + "context" "io/ioutil" "log" "testing" "time" "github.com/miekg/dns" - "golang.org/x/net/context" "google.golang.org/grpc" "github.com/coredns/coredns/pb" diff --git a/test/plugin_dnssec_test.go b/test/plugin_dnssec_test.go index 0ae6507a3..4c6a81bfa 100644 --- a/test/plugin_dnssec_test.go +++ b/test/plugin_dnssec_test.go @@ -15,7 +15,7 @@ func TestLookupBalanceRewriteCacheDnssec(t *testing.T) { t.Parallel() name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() rm1 := createKeyFile(t) diff --git a/test/plugin_test.go b/test/plugin_test.go index c2382873c..cf1680d72 100644 --- a/test/plugin_test.go +++ b/test/plugin_test.go @@ -17,7 +17,7 @@ func benchmarkLookupBalanceRewriteCache(b *testing.B) { t := new(testing.T) name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() diff --git a/test/proxy_http_health_test.go b/test/proxy_http_health_test.go index 2a31093fe..8ea778864 100644 --- a/test/proxy_http_health_test.go +++ b/test/proxy_http_health_test.go @@ -38,7 +38,7 @@ func TestProxyWithHTTPCheckOK(t *testing.T) { name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() diff --git a/test/proxy_test.go b/test/proxy_test.go index 90c1e3940..d25ace689 100644 --- a/test/proxy_test.go +++ b/test/proxy_test.go @@ -16,7 +16,7 @@ func TestLookupProxy(t *testing.T) { t.Parallel() name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() @@ -55,7 +55,7 @@ func TestLookupDnsWithForcedTcp(t *testing.T) { t.Parallel() name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() @@ -94,7 +94,7 @@ func BenchmarkProxyLookup(b *testing.B) { t := new(testing.T) name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to created zone: %s", err) + t.Fatalf("Failed to created zone: %s", err) } defer rm() @@ -105,12 +105,12 @@ func BenchmarkProxyLookup(b *testing.B) { i, err := CoreDNSServer(corefile) if err != nil { - t.Fatalf("could not get CoreDNS serving instance: %s", err) + t.Fatalf("Could not get CoreDNS serving instance: %s", err) } udp, _ := CoreDNSServerPorts(i, 0) if udp == "" { - t.Fatalf("could not get udp listening port") + t.Fatalf("Could not get udp listening port") } defer i.Stop() diff --git a/test/secondary_test.go b/test/secondary_test.go index 4b38a6208..18bfd8f15 100644 --- a/test/secondary_test.go +++ b/test/secondary_test.go @@ -40,7 +40,7 @@ func TestEmptySecondaryZone(t *testing.T) { func TestSecondaryZoneTransfer(t *testing.T) { name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm() diff --git a/test/wildcard_test.go b/test/wildcard_test.go index b233e3031..f34b5c0eb 100644 --- a/test/wildcard_test.go +++ b/test/wildcard_test.go @@ -16,7 +16,7 @@ func TestLookupWildcard(t *testing.T) { t.Parallel() name, rm, err := test.TempFile(".", exampleOrg) if err != nil { - t.Fatalf("failed to create zone: %s", err) + t.Fatalf("Failed to create zone: %s", err) } defer rm()