Merge pull request #18487 from smarterclayton/guard_encode_decode

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-13 23:08:18 -08:00
25 changed files with 103 additions and 81 deletions

View File

@@ -1259,7 +1259,7 @@ func readOrDie(t *testing.T, req *http.Request, codec runtime.Codec) runtime.Obj
t.Errorf("Error reading: %v", err)
t.FailNow()
}
obj, err := codec.Decode(data)
obj, err := runtime.Decode(codec, data)
if err != nil {
t.Errorf("error decoding: %v", err)
t.FailNow()