tpl: Add missing base64 tests

diff --git a/tpl/template_funcs.go b/tpl/template_funcs.go
index ba68fb8f39c6044e4ffa6c07c7564289ec311e5d..55b7474a546be16a1a09025f2e4d7b0ea0403c14 100644 (file)
--- a/tpl/template_funcs.go
+++ b/tpl/template_funcs.go
@@ -1422,11 +1422,7 @@ func base64Decode(content interface{}) (string, error) {
 
        dec, err := base64.StdEncoding.DecodeString(conv)
 
-       if err != nil {
-               return "", err
-       }
-
-       return string(dec), nil
+       return string(dec), err
 }
 
 // base64Encode returns the base64 encoding of the given content.

diff --git a/tpl/template_funcs_test.go b/tpl/template_funcs_test.go
index 14b5ab65407101a69d512b33042354313b8131ca..8d9eb9e794f863f7fbbd16b2dd0188289bc6e9fe 100644 (file)
--- a/tpl/template_funcs_test.go
+++ b/tpl/template_funcs_test.go
@@ -1821,11 +1821,16 @@ func TestBase64Decode(t *testing.T) {
        result, err := base64Decode(enc)
 
        if err != nil {
-               t.Error("Base64Decode:", err)
+               t.Error("base64Decode returned error:", err)
        }
 
        if result != testStr {
-               t.Errorf("Base64Decode: got '%s', expected '%s'", result, testStr)
+               t.Errorf("base64Decode: got '%s', expected '%s'", result, testStr)
+       }
+
+       _, err = base64Decode(t)
+       if err == nil {
+               t.Error("Expected error from base64Decode")
        }
 }
 
@@ -1834,16 +1839,21 @@ func TestBase64Encode(t *testing.T) {
        dec, err := base64.StdEncoding.DecodeString(testStr)
 
        if err != nil {
-               t.Error("Base64Encode: the DecodeString function of the base64 package returned an error.", err)
+               t.Error("base64Encode: the DecodeString function of the base64 package returned an error:", err)
        }
 
        result, err := base64Encode(string(dec))
 
        if err != nil {
-               t.Errorf("Base64Encode: Can't cast arg '%s' into a string.", testStr)
+               t.Errorf("base64Encode: Can't cast arg '%s' into a string:", testStr)
        }
 
        if result != testStr {
-               t.Errorf("Base64Encode: got '%s', expected '%s'", result, testStr)
+               t.Errorf("base64Encode: got '%s', expected '%s'", result, testStr)
+       }
+
+       _, err = base64Encode(t)
+       if err == nil {
+               t.Error("Expected error from base64Encode")
        }
 }