Fix staticcheck failures.

Bartek20 · Dec 14, 2016 · 06c1874 · 06c1874
1 parent 9bd4411
commit 06c1874
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/transport/core/backoff_test.go b/transport/core/backoff_test.go
@@ -51,8 +51,6 @@ func TestTries(t *testing.T) {
 	for i := uint64(0); i < 3; i++ {
 		if b.n != i {
 			t.Fatalf("want tries=%d, have tries=%d", i, b.n)
-		} else if b.n != i {
-			t.Fatalf("want tries=%d, have tries=%d", i, b.n)
 		}
 
 		pow := 1 << i

diff --git a/transport/transport_test.go b/transport/transport_test.go
@@ -210,7 +210,7 @@ func testListen(t *testing.T) {
 	log.Debug("listener waiting for connection")
 	conn, err := l.Accept()
 	if err != nil {
-		t.Fatalf("%v", err)
+		panic(err.Error())
 	}
 
 	log.Debugf("client has connected")
@@ -243,7 +243,7 @@ func TestListener(t *testing.T) {
 	go func() {
 		err := <-errChan
 		if err != nil {
-			t.Fatalf("listener auto update failed: %v", err)
+			panic("listener auto update failed: " + err.Error())
 		}
 	}()
 

diff --git a/ubiquity/ubiquity_test.go b/ubiquity/ubiquity_test.go
@@ -548,7 +548,7 @@ func TestSHA1DeprecationMessages(t *testing.T) {
 	chain2 := []*x509.Certificate{cert1, cert1}
 	chain3 := []*x509.Certificate{cert2, cert1, cert1}
 	chain4 := []*x509.Certificate{cert2, cert2, cert1}
-	messages := []string{}
+	var messages []string
 
 	Jan1st2014 := time.Date(2014, time.January, 1, 0, 0, 0, 0, time.UTC)
 	Jan1st2100 := time.Date(2100, time.January, 1, 0, 0, 0, 0, time.UTC)

diff --git a/whitelist/http_test.go b/whitelist/http_test.go
@@ -2,6 +2,7 @@ package whitelist
 
 import (
 	"io/ioutil"
+	"log"
 	"net/http"
 	"net/http/httptest"
 	"strings"
@@ -42,7 +43,7 @@ func testWorker(url string, t *testing.T, wg *sync.WaitGroup) {
 	for i := 0; i < 100; i++ {
 		response := testHTTPResponse(url, t)
 		if response != "NO" {
-			t.Fatalf("Expected NO, but got %s", response)
+			log.Fatalf("Expected NO, but got %s", response)
 		}
 	}
 	wg.Done()
@@ -360,7 +361,7 @@ func TestSetupNetHandlerFunc(t *testing.T) {
 	wl := NewBasicNet()
 	h, err := NewHandlerFunc(testAllowHandlerFunc, testDenyHandlerFunc, wl)
 	if err != nil {
-		t.Fatalf("%v", err)
+		log.Fatalf("%v", err)
 	}
 
 	srv := httptest.NewServer(h)

diff --git a/whitelist/whitelist_test.go b/whitelist/whitelist_test.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"io/ioutil"
+	"log"
 	"net"
 	"net/http"
 	"testing"
@@ -154,7 +155,7 @@ var proceed = make(chan struct{}, 0)
 func setupTestServer(t *testing.T, wl ACL) {
 	ln, err := net.Listen("tcp", "127.0.0.1:4141")
 	if err != nil {
-		t.Fatalf("%v", err)
+		log.Fatalf("%v", err)
 	}
 	proceed <- struct{}{}
 	for {
@@ -166,7 +167,7 @@ func setupTestServer(t *testing.T, wl ACL) {
 		default:
 			conn, err := ln.Accept()
 			if err != nil {
-				t.Fatalf("%v", err)
+				log.Fatalf("%v", err)
 			}
 			go handleTestConnection(conn, wl, t)
 		}
@@ -177,7 +178,7 @@ func handleTestConnection(conn net.Conn, wl ACL, t *testing.T) {
 	defer conn.Close()
 	ip, err := NetConnLookup(conn)
 	if err != nil {
-		t.Fatalf("%v", err)
+		log.Fatalf("%v", err)
 	}
 
 	if wl.Permitted(ip) {