rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-06 17:24:16 +00:00
Code Issues Releases Wiki Activity

fix tests

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2017-08-17 09:31:52 +10:00
parent f793518aa6
commit 38ac3b05fb
2 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/cmdline/cmdline.go
View File

@ -49,7 +49,7 @@ func GetOrSetVal(args string, data map[interface{}]interface{}, value interface{
// Reached end, set the value // Reached end, set the value
if last && value != nil { if last && value != nil {
if s, ok := value.(string); ok { if s, ok := value.(string); ok {
value = unmarshalOrReturnString(s) value = UnmarshalOrReturnString(s)
} }
t[part] = value t[part] = value
@ -113,7 +113,7 @@ func reverseReplacement(result interface{}) interface{} {
return result return result
} }
func unmarshalOrReturnString(value string) (result interface{}) { func UnmarshalOrReturnString(value string) (result interface{}) {
value = strings.Replace(value, "\n", newlineMagicString, -1) value = strings.Replace(value, "\n", newlineMagicString, -1)
value = strings.Replace(value, ":", colonMagicString, -1) value = strings.Replace(value, ":", colonMagicString, -1)
value = strings.Replace(value, "?", questionMarkMagicString, -1) value = strings.Replace(value, "?", questionMarkMagicString, -1)
@ -150,7 +150,7 @@ outer:
keys := strings.Split(kv[0], ".") keys := strings.Split(kv[0], ".")
for i, key := range keys { for i, key := range keys {
if i == len(keys)-1 { if i == len(keys)-1 {
current[key] = unmarshalOrReturnString(value) current[key] = UnmarshalOrReturnString(value)
} else { } else {
if obj, ok := current[key]; ok { if obj, ok := current[key]; ok {
if newCurrent, ok := obj.(map[interface{}]interface{}); ok { if newCurrent, ok := obj.(map[interface{}]interface{}); ok {

84
config/config_test.go
View File

@ -58,47 +58,47 @@ func TestFilterKey(t *testing.T) {
func TestUnmarshalOrReturnString(t *testing.T) { func TestUnmarshalOrReturnString(t *testing.T) {
assert := require.New(t) assert := require.New(t)
assert.Equal("ab", unmarshalOrReturnString("ab")) assert.Equal("ab", cmdline.UnmarshalOrReturnString("ab"))
assert.Equal("a\nb", unmarshalOrReturnString("a\nb")) assert.Equal("a\nb", cmdline.UnmarshalOrReturnString("a\nb"))
assert.Equal("a\n", unmarshalOrReturnString("a\n")) assert.Equal("a\n", cmdline.UnmarshalOrReturnString("a\n"))
assert.Equal("\nb", unmarshalOrReturnString("\nb")) assert.Equal("\nb", cmdline.UnmarshalOrReturnString("\nb"))
assert.Equal("a,b", unmarshalOrReturnString("a,b")) assert.Equal("a,b", cmdline.UnmarshalOrReturnString("a,b"))
assert.Equal("a,", unmarshalOrReturnString("a,")) assert.Equal("a,", cmdline.UnmarshalOrReturnString("a,"))
assert.Equal(",b", unmarshalOrReturnString(",b")) assert.Equal(",b", cmdline.UnmarshalOrReturnString(",b"))
assert.Equal(int64(10), unmarshalOrReturnString("10")) assert.Equal(int64(10), cmdline.UnmarshalOrReturnString("10"))
assert.Equal(true, unmarshalOrReturnString("true")) assert.Equal(true, cmdline.UnmarshalOrReturnString("true"))
assert.Equal(false, unmarshalOrReturnString("false")) assert.Equal(false, cmdline.UnmarshalOrReturnString("false"))
assert.Equal([]interface{}{"a"}, unmarshalOrReturnString("[a]")) assert.Equal([]interface{}{"a"}, cmdline.UnmarshalOrReturnString("[a]"))
assert.Equal([]interface{}{"a"}, unmarshalOrReturnString("[\"a\"]")) assert.Equal([]interface{}{"a"}, cmdline.UnmarshalOrReturnString("[\"a\"]"))
assert.Equal([]interface{}{"a,"}, unmarshalOrReturnString("[\"a,\"]")) assert.Equal([]interface{}{"a,"}, cmdline.UnmarshalOrReturnString("[\"a,\"]"))
assert.Equal([]interface{}{" a, "}, unmarshalOrReturnString("[\" a, \"]")) assert.Equal([]interface{}{" a, "}, cmdline.UnmarshalOrReturnString("[\" a, \"]"))
assert.Equal([]interface{}{",a"}, unmarshalOrReturnString("[\",a\"]")) assert.Equal([]interface{}{",a"}, cmdline.UnmarshalOrReturnString("[\",a\"]"))
assert.Equal([]interface{}{" ,a "}, unmarshalOrReturnString("[\" ,a \"]")) assert.Equal([]interface{}{" ,a "}, cmdline.UnmarshalOrReturnString("[\" ,a \"]"))
assert.Equal([]interface{}{"a\n"}, unmarshalOrReturnString("[\"a\n\"]")) assert.Equal([]interface{}{"a\n"}, cmdline.UnmarshalOrReturnString("[\"a\n\"]"))
assert.Equal([]interface{}{" a\n "}, unmarshalOrReturnString("[\" a\n \"]")) assert.Equal([]interface{}{" a\n "}, cmdline.UnmarshalOrReturnString("[\" a\n \"]"))
assert.Equal([]interface{}{"\na"}, unmarshalOrReturnString("[\"\na\"]")) assert.Equal([]interface{}{"\na"}, cmdline.UnmarshalOrReturnString("[\"\na\"]"))
assert.Equal([]interface{}{" \na "}, unmarshalOrReturnString("[\" \na \"]")) assert.Equal([]interface{}{" \na "}, cmdline.UnmarshalOrReturnString("[\" \na \"]"))
assert.Equal([]interface{}{"a", "b"}, unmarshalOrReturnString("[a,b]")) assert.Equal([]interface{}{"a", "b"}, cmdline.UnmarshalOrReturnString("[a,b]"))
assert.Equal([]interface{}{"a", "b"}, unmarshalOrReturnString("[\"a\",\"b\"]")) assert.Equal([]interface{}{"a", "b"}, cmdline.UnmarshalOrReturnString("[\"a\",\"b\"]"))
assert.Equal([]interface{}{"a,", "b"}, unmarshalOrReturnString("[\"a,\",b]")) assert.Equal([]interface{}{"a,", "b"}, cmdline.UnmarshalOrReturnString("[\"a,\",b]"))
assert.Equal([]interface{}{"a", ",b"}, unmarshalOrReturnString("[a,\",b\"]")) assert.Equal([]interface{}{"a", ",b"}, cmdline.UnmarshalOrReturnString("[a,\",b\"]"))
assert.Equal([]interface{}{" a, ", " ,b "}, unmarshalOrReturnString("[\" a, \",\" ,b \"]")) assert.Equal([]interface{}{" a, ", " ,b "}, cmdline.UnmarshalOrReturnString("[\" a, \",\" ,b \"]"))
assert.Equal([]interface{}{"a\n", "b"}, unmarshalOrReturnString("[\"a\n\",b]")) assert.Equal([]interface{}{"a\n", "b"}, cmdline.UnmarshalOrReturnString("[\"a\n\",b]"))
assert.Equal([]interface{}{"a", "\nb"}, unmarshalOrReturnString("[a,\"\nb\"]")) assert.Equal([]interface{}{"a", "\nb"}, cmdline.UnmarshalOrReturnString("[a,\"\nb\"]"))
assert.Equal([]interface{}{" a\n ", " \nb "}, unmarshalOrReturnString("[\" a\n \",\" \nb \"]")) assert.Equal([]interface{}{" a\n ", " \nb "}, cmdline.UnmarshalOrReturnString("[\" a\n \",\" \nb \"]"))
assert.Equal([]interface{}{"a", int64(10)}, unmarshalOrReturnString("[a,10]")) assert.Equal([]interface{}{"a", int64(10)}, cmdline.UnmarshalOrReturnString("[a,10]"))
assert.Equal([]interface{}{int64(10), "a"}, unmarshalOrReturnString("[10,a]")) assert.Equal([]interface{}{int64(10), "a"}, cmdline.UnmarshalOrReturnString("[10,a]"))
assert.Equal([]interface{}{"a", true}, unmarshalOrReturnString("[a,true]")) assert.Equal([]interface{}{"a", true}, cmdline.UnmarshalOrReturnString("[a,true]"))
assert.Equal([]interface{}{false, "a"}, unmarshalOrReturnString("[false,a]")) assert.Equal([]interface{}{false, "a"}, cmdline.UnmarshalOrReturnString("[false,a]"))
} }
func TestCmdlineParse(t *testing.T) { func TestCmdlineParse(t *testing.T) {
@ -109,55 +109,55 @@ func TestCmdlineParse(t *testing.T) {
"key1": "value1", "key1": "value1",
"key2": "value2", "key2": "value2",
}, },
}, cmdline.Parse("a b rancher.key1=value1 c rancher.key2=value2"), false) }, cmdline.Parse("a b rancher.key1=value1 c rancher.key2=value2", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"key": "a,b", "key": "a,b",
}, },
}, cmdline.Parse("rancher.key=a,b"), false) }, cmdline.Parse("rancher.key=a,b", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"key": "a\nb", "key": "a\nb",
}, },
}, cmdline.Parse("rancher.key=a\nb"), false) }, cmdline.Parse("rancher.key=a\nb", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"key": "a:b", "key": "a:b",
}, },
}, cmdline.Parse("rancher.key=a:b"), false) }, cmdline.Parse("rancher.key=a:b", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"key": int64(5), "key": int64(5),
}, },
}, cmdline.Parse("rancher.key=5"), false) }, cmdline.Parse("rancher.key=5", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"rescue": true, "rescue": true,
}, },
}, cmdline.Parse("rancher.rescue"), false) }, cmdline.Parse("rancher.rescue", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"keyArray": []interface{}{int64(1), int64(2)}, "keyArray": []interface{}{int64(1), int64(2)},
}, },
}, cmdline.Parse("rancher.keyArray=[1,2]"), false) }, cmdline.Parse("rancher.keyArray=[1,2]", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"}, "strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"},
}, },
}, cmdline.Parse("rancher.strArray=[\"url:http://192.168.1.100/cloud-config?a=b\"]"), false) }, cmdline.Parse("rancher.strArray=[\"url:http://192.168.1.100/cloud-config?a=b\"]", false), false)
assert.Equal(map[interface{}]interface{}{ assert.Equal(map[interface{}]interface{}{
"rancher": map[interface{}]interface{}{ "rancher": map[interface{}]interface{}{
"strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"}, "strArray": []interface{}{"url:http://192.168.1.100/cloud-config?a=b"},
}, },
}, cmdline.Parse("rancher.strArray=[url:http://192.168.1.100/cloud-config?a=b]"), false) }, cmdline.Parse("rancher.strArray=[url:http://192.168.1.100/cloud-config?a=b]", false), false)
} }
func TestGet(t *testing.T) { func TestGet(t *testing.T) {
@ -182,7 +182,7 @@ func TestGet(t *testing.T) {
} }
for k, v := range tests { for k, v := range tests {
val, _ := cmdline.GeOrSetVal(k, data, nil) val, _ := cmdline.GetOrSetVal(k, data, nil)
assert.Equal(v, val) assert.Equal(v, val)
} }
} }