Merge branch 'master' of github.com:miekg/coredns

1 files changed, 4 insertions, 2 deletions

diff --git a/middleware/httpproxy/setup_test.go b/middleware/httpproxy/setup_test.go
index 71d631220..82db40aff 100644
--- a/middleware/httpproxy/setup_test.go
+++ b/middleware/httpproxy/setup_test.go
@@ -2,6 +2,7 @@ package httpproxy
 
 import (
 	"io/ioutil"
+	"log"
 	"os"
 	"strings"
 	"testing"
@@ -9,7 +10,9 @@ import (
 	"github.com/mholt/caddy"
 )
 
-func TestSetupChaos(t *testing.T) {
+func TestSetupHttpproxy(t *testing.T) {
+	log.SetOutput(ioutil.Discard)
+
 	tests := []struct {
 		input              string
 		shouldErr          bool
@@ -55,7 +58,6 @@ func TestSetupChaos(t *testing.T) {
 		}
 
 		if err != nil {
-			t.Logf("%q", err)
 			if !test.shouldErr {
 				t.Errorf("Test %d: Expected no error but found one for input %s. Error was: %v", i, test.input, err)
 			}