Commit 70cd32c4 authored by Oleg Sidorov's avatar Oleg Sidorov

Fixed failing tests for helm installer

Signed-off-by: 's avatarOleg Sidorov <oleg.sidorov@booking.com>
parent 9014bd9c
...@@ -17,6 +17,7 @@ limitations under the License. ...@@ -17,6 +17,7 @@ limitations under the License.
package installer // import "k8s.io/helm/cmd/helm/installer" package installer // import "k8s.io/helm/cmd/helm/installer"
import ( import (
"encoding/json"
"os" "os"
"path/filepath" "path/filepath"
"reflect" "reflect"
...@@ -716,9 +717,32 @@ func TestDeployment_WithSetValues(t *testing.T) { ...@@ -716,9 +717,32 @@ func TestDeployment_WithSetValues(t *testing.T) {
// convert our expected value to match the result type for comparison // convert our expected value to match the result type for comparison
ev := tt.expect ev := tt.expect
intType := reflect.TypeOf(int64(0))
floatType := reflect.TypeOf(float64(0))
switch pvt := pv.(type) { switch pvt := pv.(type) {
case json.Number:
evv := reflect.ValueOf(ev)
evv = reflect.Indirect(evv)
switch ev.(type) {
case float32, float64:
evv = evv.Convert(floatType)
if fpv, err := pv.(json.Number).Float64(); err != nil {
t.Errorf("Failed to convert json number to float: %s", err)
} else if fpv != evv.Float() {
t.Errorf("%s: expected float value %q, got %f", tt.name, tt.expect, fpv)
}
case byte, int, int32, int64:
evv = evv.Convert(intType)
if ipv, err := pv.(json.Number).Int64(); err != nil {
t.Errorf("Failed to convert json number to int: %s", err)
} else if ipv != evv.Int() {
t.Errorf("%s: expected int value %q, got %d", tt.name, tt.expect, ipv)
}
default:
t.Errorf("Unknown primitive type: %s", reflect.TypeOf(ev))
}
case float64: case float64:
floatType := reflect.TypeOf(float64(0))
v := reflect.ValueOf(ev) v := reflect.ValueOf(ev)
v = reflect.Indirect(v) v = reflect.Indirect(v)
if !v.Type().ConvertibleTo(floatType) { if !v.Type().ConvertibleTo(floatType) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment