github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19013 from wojtek-t/eliminate_rubish_logs 

Eliminate rubbish logs in pkg/conversion tests
pull/6/head
Marek Grabowski 2015-12-23 08:43:31 +01:00
parent cf69083697 55747ec1ce
commit e5d4663dd8
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/conversion/converter_test.go
View File

@ -26,6 +26,12 @@ import (
"github.com/google/gofuzz" "github.com/google/gofuzz"
) )
func testLogger(t *testing.T) DebugLogger {
// We don't set logger to eliminate rubbish logs in tests.
// If you want to switch it, simply switch it to: "return t"
return nil
}
func TestConverter_byteSlice(t *testing.T) { func TestConverter_byteSlice(t *testing.T) {
c := NewConverter() c := NewConverter()
src := []byte{1, 2, 3} src := []byte{1, 2, 3}
@ -77,7 +83,7 @@ func TestConverter_DefaultConvert(t *testing.T) {
Baz int Baz int
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
c.nameFunc = func(t reflect.Type) string { return "MyType" } c.nameFunc = func(t reflect.Type) string { return "MyType" }
// Ensure conversion funcs can call DefaultConvert to get default behavior, // Ensure conversion funcs can call DefaultConvert to get default behavior,
@ -116,7 +122,7 @@ func TestConverter_DeepCopy(t *testing.T) {
Qux map[string]string Qux map[string]string
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
foo, baz := "foo", "baz" foo, baz := "foo", "baz"
x := A{ x := A{
@ -159,7 +165,7 @@ func TestConverter_CallsRegisteredFunctions(t *testing.T) {
} }
type C struct{} type C struct{}
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
err := c.RegisterConversionFunc(func(in *A, out *B, s Scope) error { err := c.RegisterConversionFunc(func(in *A, out *B, s Scope) error {
out.Bar = in.Foo out.Bar = in.Foo
return s.Convert(&in.Baz, &out.Baz, 0) return s.Convert(&in.Baz, &out.Baz, 0)
@ -244,7 +250,7 @@ func TestConverter_MapsStringArrays(t *testing.T) {
Other string Other string
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
if err := c.RegisterConversionFunc(func(input *[]string, out *string, s Scope) error { if err := c.RegisterConversionFunc(func(input *[]string, out *string, s Scope) error {
if len(*input) == 0 { if len(*input) == 0 {
*out = "" *out = ""
@ -297,7 +303,7 @@ func TestConverter_MapsStringArraysWithMappingKey(t *testing.T) {
Other string Other string
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
if err := c.RegisterConversionFunc(func(input *[]string, out *string, s Scope) error { if err := c.RegisterConversionFunc(func(input *[]string, out *string, s Scope) error {
if len(*input) == 0 { if len(*input) == 0 {
*out = "" *out = ""
@ -356,7 +362,7 @@ func TestConverter_fuzz(t *testing.T) {
reflect.TypeOf(ExternalTestType2{}): "TestType2", reflect.TypeOf(ExternalTestType2{}): "TestType2",
}[t] }[t]
} }
c.Debug = t c.Debug = testLogger(t)
for i, item := range table { for i, item := range table {
for j := 0; j < *fuzzIters; j++ { for j := 0; j < *fuzzIters; j++ {
@ -386,7 +392,7 @@ func TestConverter_MapElemAddr(t *testing.T) {
A map[string]string A map[string]string
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
err := c.RegisterConversionFunc( err := c.RegisterConversionFunc(
func(in *int, out *string, s Scope) error { func(in *int, out *string, s Scope) error {
*out = fmt.Sprintf("%v", *in) *out = fmt.Sprintf("%v", *in)
@ -432,7 +438,7 @@ func TestConverter_tags(t *testing.T) {
A string `test:"bar"` A string `test:"bar"`
} }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
err := c.RegisterConversionFunc( err := c.RegisterConversionFunc(
func(in *string, out *string, s Scope) error { func(in *string, out *string, s Scope) error {
if e, a := "foo", s.SrcTag().Get("test"); e != a { if e, a := "foo", s.SrcTag().Get("test"); e != a {
@ -457,7 +463,7 @@ func TestConverter_meta(t *testing.T) {
type Foo struct{ A string } type Foo struct{ A string }
type Bar struct{ A string } type Bar struct{ A string }
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
checks := 0 checks := 0
err := c.RegisterConversionFunc( err := c.RegisterConversionFunc(
func(in *Foo, out *Bar, s Scope) error { func(in *Foo, out *Bar, s Scope) error {
@ -566,7 +572,7 @@ func TestConverter_flags(t *testing.T) {
} }
f := fuzz.New().NilChance(.5).NumElements(0, 100) f := fuzz.New().NilChance(.5).NumElements(0, 100)
c := NewConverter() c := NewConverter()
c.Debug = t c.Debug = testLogger(t)
for i, item := range table { for i, item := range table {
for j := 0; j < *fuzzIters; j++ { for j := 0; j < *fuzzIters; j++ {
@ -620,7 +626,7 @@ func TestConverter_FieldRename(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("unexpected error %v", err) t.Fatalf("unexpected error %v", err)
} }
c.Debug = t c.Debug = testLogger(t)
aVal := &A{ aVal := &A{
WeirdMeta: WeirdMeta{ WeirdMeta: WeirdMeta{