diff options
| author |  Miek Gieben <miek@miek.nl>
| 2016-04-21 14:26:02 +0100 |
|---|---|---|
| committer | Miek Gieben <miek@miek.nl>
| 2016-04-21 14:26:02 +0100 |
| commit | e5e0cde08fa5334c4014494a6991cc740a5bed9f (patch) | |
| tree | 70c17799d5b234adc3935531c13ba8af3294a88b | |
| parent | f5e29c14d3848da4a9314cee080de3fafb4a46e0 (diff) | |
| download | coredns-e5e0cde08fa5334c4014494a6991cc740a5bed9f.tar.gz coredns-e5e0cde08fa5334c4014494a6991cc740a5bed9f.tar.zst coredns-e5e0cde08fa5334c4014494a6991cc740a5bed9f.zip | |
Fix travis.yml (#129)
Also fix failing test in setup/error.
| -rw-r--r-- | .travis.yml | 10 | ||||
| -rw-r--r-- | core/setup/errors_test.go | 12 |
2 files changed, 5 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml index f903b6e80..bbf668d6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,10 @@ go: - 1.5 - 1.6 before_script: + - curl -L https://github.com/coreos/etcd/releases/download/v2.3.1/etcd-v2.3.1-linux-amd64.tar.gz -o etcd-v2.3.1-linux-amd64.tar.gz + - tar xzvf etcd-v2.3.1-linux-amd64.tar.gz + - ./etcd-v2.3.1-linux-amd64/etcd & - go get - go get github.com/coreos/go-etcd/etcd - # - go get github.com/coreos/etcd - #- go build -o $HOME/gopath/src/github.com/coreos/etcd/etcd.run github.com/coreos/etcd - #- $HOME/gopath/src/github.com/coreos/etcd/etcd.run & - #- sleep 2 script: - #- go test -tags etcd -race -bench=. ./... - - go test -race -bench=. ./... + - go test -tags etcd -race -bench=. ./... diff --git a/core/setup/errors_test.go b/core/setup/errors_test.go index f84b3466d..42f625f92 100644 --- a/core/setup/errors_test.go +++ b/core/setup/errors_test.go @@ -20,8 +20,7 @@ func TestErrors(t *testing.T) { } handler := mid(EmptyNext) - myHandler, ok := handler.(*errors.ErrorHandler) - + myHandler, ok := handler.(errors.ErrorHandler) if !ok { t.Fatalf("Expected handler to be type ErrorHandler, got: %#v", handler) } @@ -35,15 +34,6 @@ func TestErrors(t *testing.T) { if !SameNext(myHandler.Next, EmptyNext) { t.Error("'Next' field of handler was not set properly") } - - // Test Startup function - if len(c.Startup) == 0 { - t.Fatal("Expected 1 startup function, had 0") - } - err = c.Startup[0]() - if myHandler.Log == nil { - t.Error("Expected Log to be non-nil after startup because Debug is not enabled") - } } func TestErrorsParse(t *testing.T) { |