github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 10:47:25 +00:00
Code Issues Projects Releases Wiki Activity

Update generator tests to passing

Browse Source
This commit is contained in:
Clayton Coleman
2015-07-30 14:45:27 -04:00
parent 0f9fdcafea
commit 532e1ca20c
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/runtime/conversion_generation_test.go
View File

@@ -23,31 +23,37 @@ import (
"io" "io"
"io/ioutil" "io/ioutil"
"os" "os"
"path"
"testing" "testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
) )
func generateConversions(t *testing.T, version string) bytes.Buffer { func generateConversions(t *testing.T, version string) bytes.Buffer {
g := runtime.NewConversionGenerator(api.Scheme.Raw()) g := runtime.NewConversionGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", version))
apiShort := g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource")
// TODO(wojtek-t): Change the overwrites to a flag.
g.OverwritePackage(version, "") g.OverwritePackage(version, "")
for _, knownType := range api.Scheme.KnownTypes(version) { for _, knownType := range api.Scheme.KnownTypes(version) {
if err := g.GenerateConversionsForType(version, knownType); err != nil { if err := g.GenerateConversionsForType(version, knownType); err != nil {
glog.Errorf("error while generating conversion functions for %v: %v", knownType, err) t.Fatalf("error while generating conversion functions for %v: %v", knownType, err)
} }
} }
g.RepackImports(util.NewStringSet())
var functions bytes.Buffer var functions bytes.Buffer
functionsWriter := bufio.NewWriter(&functions) functionsWriter := bufio.NewWriter(&functions)
if err := g.WriteImports(functionsWriter); err != nil {
t.Fatalf("error while writing imports: %v", err)
}
if err := g.WriteConversionFunctions(functionsWriter); err != nil { if err := g.WriteConversionFunctions(functionsWriter); err != nil {
t.Fatalf("couldn't generate conversion functions: %v", err) t.Fatalf("couldn't generate conversion functions: %v", err)
} }
if err := g.RegisterConversionFunctions(functionsWriter); err != nil { if err := g.RegisterConversionFunctions(functionsWriter, fmt.Sprintf("%s.Scheme", apiShort)); err != nil {
t.Fatalf("couldn't generate conversion function names: %v", err) t.Fatalf("couldn't generate conversion function names: %v", err)
} }
if err := functionsWriter.Flush(); err != nil { if err := functionsWriter.Flush(); err != nil {

18
pkg/runtime/deep_copy_generation_test.go
View File

@@ -22,23 +22,30 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path"
"testing" "testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi" "github.com/GoogleCloudPlatform/kubernetes/pkg/api/testapi"
_ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1" _ "github.com/GoogleCloudPlatform/kubernetes/pkg/api/v1"
"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime" "github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog" "github.com/golang/glog"
) )
func generateDeepCopies(t *testing.T, version string) bytes.Buffer { func generateDeepCopies(t *testing.T, version string) bytes.Buffer {
g := runtime.NewDeepCopyGenerator(api.Scheme.Raw())
g.OverwritePackage(version, "")
testedVersion := version testedVersion := version
if version == "api" { registerTo := "api.Scheme"
if testedVersion == "api" {
testedVersion = api.Scheme.Raw().InternalVersion testedVersion = api.Scheme.Raw().InternalVersion
registerTo = "Scheme"
} }
g := runtime.NewDeepCopyGenerator(api.Scheme.Raw(), path.Join("github.com/GoogleCloudPlatform/kubernetes/pkg/api", testedVersion), util.NewStringSet("github.com/GoogleCloudPlatform/kubernetes"))
g.AddImport("github.com/GoogleCloudPlatform/kubernetes/pkg/api")
g.OverwritePackage(version, "")
for _, knownType := range api.Scheme.KnownTypes(testedVersion) { for _, knownType := range api.Scheme.KnownTypes(testedVersion) {
if err := g.AddType(knownType); err != nil { if err := g.AddType(knownType); err != nil {
glog.Errorf("error while generating deep-copy functions for %v: %v", knownType, err) glog.Errorf("error while generating deep-copy functions for %v: %v", knownType, err)
@@ -47,13 +54,14 @@ func generateDeepCopies(t *testing.T, version string) bytes.Buffer {
var functions bytes.Buffer var functions bytes.Buffer
functionsWriter := bufio.NewWriter(&functions) functionsWriter := bufio.NewWriter(&functions)
if err := g.WriteImports(functionsWriter, version); err != nil { g.RepackImports()
if err := g.WriteImports(functionsWriter); err != nil {
t.Fatalf("couldn't generate deep-copy function imports: %v", err) t.Fatalf("couldn't generate deep-copy function imports: %v", err)
} }
if err := g.WriteDeepCopyFunctions(functionsWriter); err != nil { if err := g.WriteDeepCopyFunctions(functionsWriter); err != nil {
t.Fatalf("couldn't generate deep-copy functions: %v", err) t.Fatalf("couldn't generate deep-copy functions: %v", err)
} }
if err := g.RegisterDeepCopyFunctions(functionsWriter, version); err != nil { if err := g.RegisterDeepCopyFunctions(functionsWriter, registerTo); err != nil {
t.Fatalf("couldn't generate deep-copy function names: %v", err) t.Fatalf("couldn't generate deep-copy function names: %v", err)
} }
if err := functionsWriter.Flush(); err != nil { if err := functionsWriter.Flush(); err != nil {