github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

remove API dependency on printers

Browse Source
This commit is contained in:
David Eads 2018-05-21 13:46:53 -04:00
parent 080739a12a
commit 3693ed095f
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/api/testing/compat/BUILD
View File

@ -11,7 +11,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/api/testing/compat", importpath = "k8s.io/kubernetes/pkg/api/testing/compat",
deps = [ deps = [
"//pkg/api/legacyscheme:go_default_library", "//pkg/api/legacyscheme:go_default_library",
"//pkg/printers:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/validation/field:go_default_library",

18
pkg/api/testing/compat/compatibility_tester.go
View File

@ -19,7 +19,6 @@ package compat
import ( import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"os"
"reflect" "reflect"
"regexp" "regexp"
"strconv" "strconv"
@ -30,7 +29,6 @@ import (
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/util/validation/field" "k8s.io/apimachinery/pkg/util/validation/field"
"k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/api/legacyscheme"
"k8s.io/kubernetes/pkg/printers"
) )
// Based on: https://github.com/openshift/origin/blob/master/pkg/api/compatibility_test.go // Based on: https://github.com/openshift/origin/blob/master/pkg/api/compatibility_test.go
@ -72,14 +70,11 @@ func TestCompatibility(
t.Fatalf("Unexpected error: %v", err) t.Fatalf("Unexpected error: %v", err)
} }
hasError := false
for k, expectedValue := range expectedKeys { for k, expectedValue := range expectedKeys {
keys := strings.Split(k, ".") keys := strings.Split(k, ".")
if actualValue, ok, err := getJSONValue(generic, keys...); err != nil || !ok { if actualValue, ok, err := getJSONValue(generic, keys...); err != nil || !ok {
t.Errorf("Unexpected error for %s: %v", k, err) t.Errorf("Unexpected error for %s: %v", k, err)
hasError = true
} else if !reflect.DeepEqual(expectedValue, fmt.Sprintf("%v", actualValue)) { } else if !reflect.DeepEqual(expectedValue, fmt.Sprintf("%v", actualValue)) {
hasError = true
t.Errorf("Unexpected value for %v: expected %v, got %v", k, expectedValue, actualValue) t.Errorf("Unexpected value for %v: expected %v, got %v", k, expectedValue, actualValue)
} }
} }
@ -89,14 +84,17 @@ func TestCompatibility(
actualValue, ok, err := getJSONValue(generic, keys...) actualValue, ok, err := getJSONValue(generic, keys...)
if err == nil || ok { if err == nil || ok {
t.Errorf("Unexpected value found for key %s: %v", absentKey, actualValue) t.Errorf("Unexpected value found for key %s: %v", absentKey, actualValue)
hasError = true
} }
} }
if hasError { if t.Failed() {
printer := &printers.JSONPrinter{} data, err := json.MarshalIndent(obj, "", " ")
printer.PrintObj(obj, os.Stdout) if err != nil {
t.Logf("2: Encoded value: %#v", string(output)) t.Log(err)
} else {
t.Log(string(data))
}
t.Logf("2: Encoded value: %v", string(output))
} }
} }