github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes:

Browse Source 
* Fix kubecfg test, which was writing an internal object straight to yaml
* Address review comments
This commit is contained in:
Daniel Smith
2014-09-11 12:31:46 -07:00
parent 52d2c221b8
commit b8c955ea17
7 changed files with 82 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/conversion/converter_test.go
View File

@@ -103,7 +103,7 @@ func TestConverter_fuzz(t *testing.T) {
f := fuzz.New().NilChance(.5).NumElements(0, 100)
c := NewConverter()
c.Name = func(t reflect.Type) string {
c.NameFunc = func(t reflect.Type) string {
// Hide the fact that we don't have separate packages for these things.
return map[reflect.Type]string{
reflect.TypeOf(TestType1{}): "TestType1",
@@ -168,7 +168,7 @@ func TestConverter_meta(t *testing.T) {
checks := 0
err := c.Register(
func(in *Foo, out *Bar, s Scope) error {
if s.Meta()["test"] != "passes" {
if s.Meta() == nil || s.Meta().SrcVersion != "test" || s.Meta().DestVersion != "passes" {
t.Errorf("Meta did not get passed!")
}
checks++
@@ -181,7 +181,7 @@ func TestConverter_meta(t *testing.T) {
}
err = c.Register(
func(in *string, out *string, s Scope) error {
if s.Meta()["test"] != "passes" {
if s.Meta() == nil || s.Meta().SrcVersion != "test" || s.Meta().DestVersion != "passes" {
t.Errorf("Meta did not get passed a second time!")
}
checks++
@@ -191,7 +191,7 @@ func TestConverter_meta(t *testing.T) {
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}
err = c.Convert(&Foo{}, &Bar{}, 0, map[string]interface{}{"test": "passes"})
err = c.Convert(&Foo{}, &Bar{}, 0, &Meta{SrcVersion: "test", DestVersion: "passes"})
if err != nil {
t.Fatalf("Unexpected error: %v", err)
}