github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix go lint errors in util

Browse Source
This commit is contained in:
Kouhei Ueno
2014-07-11 21:04:34 +09:00
parent 628667a2b0
commit 93def86a9e
4 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/util/util_test.go
View File

@@ -74,10 +74,10 @@ type IntOrStringHolder struct {
func TestIntOrStringUnmarshalYAML(t *testing.T) {
{
yaml_code_int := "val: 123\n"
yamlCodeInt := "val: 123\n"
var result IntOrStringHolder
if err := yaml.Unmarshal([]byte(yaml_code_int), &result); err != nil {
if err := yaml.Unmarshal([]byte(yamlCodeInt), &result); err != nil {
t.Errorf("Failed to unmarshal: %v", err)
}
if result.IOrS.Kind != IntstrInt || result.IOrS.IntVal != 123 {
@@ -86,10 +86,10 @@ func TestIntOrStringUnmarshalYAML(t *testing.T) {
}
{
yaml_code_str := "val: \"123\"\n"
yamlCodeStr := "val: \"123\"\n"
var result IntOrStringHolder
if err := yaml.Unmarshal([]byte(yaml_code_str), &result); err != nil {
if err := yaml.Unmarshal([]byte(yamlCodeStr), &result); err != nil {
t.Errorf("Failed to unmarshal: %v", err)
}
if result.IOrS.Kind != IntstrString || result.IOrS.StrVal != "123" {
@@ -134,10 +134,10 @@ func TestIntOrStringMarshalYAML(t *testing.T) {
func TestIntOrStringUnmarshalJSON(t *testing.T) {
{
json_code_int := "{\"val\": 123}"
jsonCodeInt := "{\"val\": 123}"
var result IntOrStringHolder
if err := json.Unmarshal([]byte(json_code_int), &result); err != nil {
if err := json.Unmarshal([]byte(jsonCodeInt), &result); err != nil {
t.Errorf("Failed to unmarshal: %v", err)
}
if result.IOrS.Kind != IntstrInt || result.IOrS.IntVal != 123 {
@@ -146,10 +146,10 @@ func TestIntOrStringUnmarshalJSON(t *testing.T) {
}
{
json_code_str := "{\"val\": \"123\"}"
jsonCodeStr := "{\"val\": \"123\"}"
var result IntOrStringHolder
if err := json.Unmarshal([]byte(json_code_str), &result); err != nil {
if err := json.Unmarshal([]byte(jsonCodeStr), &result); err != nil {
t.Errorf("Failed to unmarshal: %v", err)
}
if result.IOrS.Kind != IntstrString || result.IOrS.StrVal != "123" {