Using assertions

cmd/kube-controller-manager/app/BUILD

@@ -151,5 +151,8 @@ go_test(
     name = "go_default_test",
     srcs = ["controller_manager_test.go"],
     library = ":go_default_library",
-    deps = ["//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library"],
+    deps = [
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
+    ],
 )

cmd/kube-controller-manager/app/controller_manager_test.go

@@ -24,6 +24,8 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/util/sets"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestIsControllerEnabled(t *testing.T) {
@@ -73,9 +75,7 @@ func TestIsControllerEnabled(t *testing.T) {
 
 	for _, tc := range tcs {
 		actual := IsControllerEnabled(tc.controllerName, sets.NewString(tc.disabledByDefaultControllers...), tc.controllers...)
-		if actual != tc.expected {
-			t.Errorf("%v: expected %v, got %v", tc.name, tc.expected, actual)
-		}
+		assert.Equal(t, tc.expected, actual, "%v: expected %v, got %v", tc.name, tc.expected, actual)
 	}
 
 }

pkg/controller/BUILD

@@ -19,6 +19,7 @@ go_test(
         "//pkg/api/testapi:go_default_library",
         "//pkg/controller/testutil:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/api/equality:go_default_library",

pkg/controller/bootstrap/jws_test.go

@@ -16,7 +16,11 @@ limitations under the License.
 
 package bootstrap
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
 
 const (
 	content = "Hello from the other side. I must have called a thousand times."
@@ -26,42 +30,40 @@ const (
 
 func TestComputeDetachedSig(t *testing.T) {
 	sig, err := computeDetachedSig(content, id, secret)
-	if err != nil {
-		t.Errorf("Error when computing signature: %v", err)
-	}
-	if sig != "eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..VShe2taLd-YTrmWuRkcL_8QTNDHYxQIEBsAYYiIj1_8" {
-		t.Errorf("Wrong signature. Got: %v", sig)
-	}
+	assert.NoError(t, err, "Error when computing signature: %v", err)
+	assert.Equal(
+		t,
+		"eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..VShe2taLd-YTrmWuRkcL_8QTNDHYxQIEBsAYYiIj1_8",
+		sig,
+		"Wrong signature. Got: %v", sig)
 
 	// Try with null content
 	sig, err = computeDetachedSig("", id, secret)
-	if err != nil {
-		t.Errorf("Error when computing signature: %v", err)
-	}
-	if sig != "eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..7Ui1ALizW4jXphVUB7xUqC9vLYLL9RZeOFfVLoB7Tgk" {
-		t.Errorf("Wrong signature. Got: %v", sig)
-	}
+	assert.NoError(t, err, "Error when computing signature: %v", err)
+	assert.Equal(
+		t,
+		"eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..7Ui1ALizW4jXphVUB7xUqC9vLYLL9RZeOFfVLoB7Tgk",
+		sig,
+		"Wrong signature. Got: %v", sig)
 
 	// Try with no secret
 	sig, err = computeDetachedSig(content, id, "")
-	if err != nil {
-		t.Errorf("Error when computing signature: %v", err)
-	}
-	if sig != "eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..UfkqvDGiIFxrMnFseDj9LYJOLNrvjW8aHhF71mvvAs8" {
-		t.Errorf("Wrong signature. Got: %v", sig)
-	}
+	assert.NoError(t, err, "Error when computing signature: %v", err)
+	assert.Equal(
+		t,
+		"eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..UfkqvDGiIFxrMnFseDj9LYJOLNrvjW8aHhF71mvvAs8",
+		sig,
+		"Wrong signature. Got: %v", sig)
 }
 
 func TestDetachedTokenIsValid(t *testing.T) {
 	// Valid detached JWS token and valid inputs should succeed
 	sig := "eyJhbGciOiJIUzI1NiIsImtpZCI6Impvc2h1YSJ9..VShe2taLd-YTrmWuRkcL_8QTNDHYxQIEBsAYYiIj1_8"
-	if !DetachedTokenIsValid(sig, content, id, secret) {
-		t.Errorf("Content %q and token \"%s:%s\" should equal signature: %q", content, id, secret, sig)
-	}
+	assert.True(t, DetachedTokenIsValid(sig, content, id, secret),
+		"Content %q and token \"%s:%s\" should equal signature: %q", content, id, secret, sig)
 
 	// Invalid detached JWS token and valid inputs should fail
 	sig2 := sig + "foo"
-	if DetachedTokenIsValid(sig2, content, id, secret) {
-		t.Errorf("Content %q and token \"%s:%s\" should not equal signature: %q", content, id, secret, sig)
-	}
+	assert.False(t, DetachedTokenIsValid(sig2, content, id, secret),
+		"Content %q and token \"%s:%s\" should not equal signature: %q", content, id, secret, sig)
 }

pkg/controller/cloud/BUILD

@@ -56,6 +56,7 @@ go_test(
         "//pkg/kubelet/apis:go_default_library",
         "//plugin/pkg/scheduler/algorithm:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/github.com/stretchr/testify/assert:go_default_library",
         "//vendor/k8s.io/api/core/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",