github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 14:37:00 +00:00
Code Issues Projects Releases Wiki Activity

apply/strategy: Improve test performance

Browse Source 
Test running time goes from 150 seconds to 7 seconds with that one
simple trick. Do not re-parse openapi schema for every test, but keep
one version for the whole test (specifically since it's read-only anyway).
This commit is contained in:
Antoine Pelisse 2017-10-23 16:46:35 -07:00
parent e95672de45
commit ed38f43495
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubectl/apply/strategy/merge_map_list_test.go
View File

@ -20,6 +20,8 @@ import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
var _ = Describe("Merging fields of type list-of-map with openapi", func() {
@ -431,6 +433,11 @@ spec:
})
var _ = Describe("Merging fields of type list-of-map with openapi containing a multi-field mergekey", func() {
var resources openapi.Resources
BeforeEach(func() {
resources = tst.NewFakeResources("test_swagger.json")
})
Context("where one of the items has been deleted", func() {
It("should delete the item", func() {
recorded := create(`
@ -492,7 +499,7 @@ spec:
protocol: TCP
hostPort: 2020
`)
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, "test_swagger.json")
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, resources)
})
})
@ -564,7 +571,7 @@ spec:
hostPort: 2022
hostIP: "127.0.0.1"
`)
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, "test_swagger.json")
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, resources)
})
})
@ -630,7 +637,7 @@ spec:
protocol: UDP
hostPort: 2022
`)
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, "test_swagger.json")
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, resources)
})
})
})

1
pkg/kubectl/apply/strategy/merge_visitor.go
View File

@ -51,7 +51,6 @@ func (v mergeStrategy) MergeList(e apply.ListElement) (apply.Result, error) {
return apply.Result{}, err
}
fmt.Printf("\nResult %+v\n%+v\n", m.MergedResult, value)
switch m.Operation {
case apply.SET:
// Keep the list item value

9
pkg/kubectl/apply/strategy/replace_map_test.go
View File

@ -20,9 +20,16 @@ import (
. "github.com/onsi/ginkgo"
"k8s.io/kubernetes/pkg/kubectl/apply/strategy"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
var _ = Describe("Replacing fields of type map with openapi for some fields", func() {
var resources openapi.Resources
BeforeEach(func() {
resources = tst.NewFakeResources("test_swagger.json")
})
Context("where a field is has been updated", func() {
It("should update the field", func() {
recorded := create(`
@ -67,7 +74,7 @@ spec:
`)
// Use modified swagger for ReplicaSet spec
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, "test_swagger.json")
runWith(strategy.Create(strategy.Options{}), recorded, local, remote, expected, resources)
})
})
})

12
pkg/kubectl/apply/strategy/utils_test.go
View File

@ -32,18 +32,14 @@ import (
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
var fakeResources = tst.NewFakeResources(filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json"))
// run parses the openapi and runs the tests
func run(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}) {
runWith(instance, recorded, local, remote, expected,
filepath.Join("..", "..", "..", "..", "api", "openapi-spec", "swagger.json"))
runWith(instance, recorded, local, remote, expected, fakeResources)
}
func runWith(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}, swaggerPath string) {
fakeSchema := tst.Fake{Path: swaggerPath}
s, err := fakeSchema.OpenAPISchema()
Expect(err).To(BeNil())
resources, err := openapi.NewOpenAPIData(s)
Expect(err).To(BeNil())
func runWith(instance apply.Strategy, recorded, local, remote, expected map[string]interface{}, resources openapi.Resources) {
parseFactory := parse.Factory{Resources: resources}
parsed, err := parseFactory.CreateElement(recorded, local, remote)