github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

remove unnecessary expectNoError helper function

Browse Source 
This patch completes a TODO item for the replication_controller test
suite by removing the expectNoError helper function, which does not
reduce enough typing to justify its usage.
This commit is contained in:
Kelsey Hightower 2014-07-20 09:13:11 -07:00
parent 3398646170
commit 3b9029ee94
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/controller/replication_controller_test.go
View File

@ -34,13 +34,6 @@ import (
// TODO: Move this to a common place, it's needed in multiple tests.
var apiPath = "/api/v1beta1"
// TODO: This doesn't reduce typing enough to make it worth the less readable errors. Remove.
func expectNoError(t *testing.T, err error) {
if err != nil {
t.Errorf("Unexpected error: %#v", err)
}
}
func makeURL(suffix string) string {
return apiPath + suffix
}
@ -234,7 +227,9 @@ func TestHandleWatchResponseNotSet(t *testing.T) {
_, err := manager.handleWatchResponse(&etcd.Response{
Action: "update",
})
expectNoError(t, err)
if err != nil {
t.Errorf("Unexpected error: %#v", err)
}
}
func TestHandleWatchResponseNoNode(t *testing.T) {
@ -299,7 +294,9 @@ func TestHandleWatchResponse(t *testing.T) {
controller := makeReplicationController(2)
data, err := json.Marshal(controller)
expectNoError(t, err)
if err != nil {
t.Errorf("Unexpected error: %#v", err)
}
controllerOut, err := manager.handleWatchResponse(&etcd.Response{
Action: "set",
Node: &etcd.Node{
@ -331,7 +328,9 @@ func TestHandleWatchResponseDelete(t *testing.T) {
controller := makeReplicationController(2)
data, err := json.Marshal(controller)
expectNoError(t, err)
if err != nil {
t.Errorf("Unexpected error: %#v", err)
}
controllerOut, err := manager.handleWatchResponse(&etcd.Response{
Action: "delete",
PrevNode: &etcd.Node{