github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #538 from kelseyhightower/replication_controller_test 

remove unnecessary expectNoError helper function
pull/6/head
Daniel Smith 2014-07-20 23:02:56 -07:00
parent d11b6246a1 a9e0b0d1a3
commit 7910ae8159
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. // TODO: Move this to a common place, it's needed in multiple tests.
var apiPath = "/api/v1beta1" 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 { func makeURL(suffix string) string {
return apiPath + suffix return apiPath + suffix
} }
@ -234,7 +227,9 @@ func TestHandleWatchResponseNotSet(t *testing.T) {
_, err := manager.handleWatchResponse(&etcd.Response{ _, err := manager.handleWatchResponse(&etcd.Response{
Action: "update", Action: "update",
}) })
expectNoError(t, err) if err != nil {
t.Errorf("Unexpected error: %v", err)
}
} }
func TestHandleWatchResponseNoNode(t *testing.T) { func TestHandleWatchResponseNoNode(t *testing.T) {
@ -299,7 +294,9 @@ func TestHandleWatchResponse(t *testing.T) {
controller := makeReplicationController(2) controller := makeReplicationController(2)
data, err := json.Marshal(controller) data, err := json.Marshal(controller)
expectNoError(t, err) if err != nil {
t.Errorf("Unexpected error: %v", err)
}
controllerOut, err := manager.handleWatchResponse(&etcd.Response{ controllerOut, err := manager.handleWatchResponse(&etcd.Response{
Action: "set", Action: "set",
Node: &etcd.Node{ Node: &etcd.Node{
@ -331,7 +328,9 @@ func TestHandleWatchResponseDelete(t *testing.T) {
controller := makeReplicationController(2) controller := makeReplicationController(2)
data, err := json.Marshal(controller) data, err := json.Marshal(controller)
expectNoError(t, err) if err != nil {
t.Errorf("Unexpected error: %v", err)
}
controllerOut, err := manager.handleWatchResponse(&etcd.Response{ controllerOut, err := manager.handleWatchResponse(&etcd.Response{
Action: "delete", Action: "delete",
PrevNode: &etcd.Node{ PrevNode: &etcd.Node{