kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-13 01:50:55 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Defer openAPI cleanup

Browse Source
This commit is contained in:
Phani Teja Marupaka
2020-11-02 12:07:32 -08:00
parent 49094cf999
commit ec2cc2d421
13 changed files with 110 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
kyaml/openapi/openapi_test.go
View File

@@ -143,10 +143,11 @@ openAPI:
t.FailNow()
}
err = AddSchemaFromFile(f.Name())
clean, err := AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
defer clean()
s, err := GetSchema(`{"$ref": "#/definitions/io.k8s.cli.setters.image-name"}`)
@@ -179,7 +180,7 @@ openAPI:
t.FailNow()
}
err = AddSchemaFromFile(f.Name())
clean, err := AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
@@ -195,10 +196,7 @@ openAPI:
assert.Equal(t, `map[x-k8s-cli:map[setter:map[name:image-name value:nginx]]]`,
fmt.Sprintf("%v", s.Schema.Extensions))
err = DeleteSchemaInFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
clean()
_, err = GetSchema(`{"$ref": "#/definitions/io.k8s.cli.setters.image-name"}`)
@@ -225,15 +223,11 @@ openAPI:
t.FailNow()
}
err = AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
err = DeleteSchemaInFile(f.Name())
clean, err := AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
defer clean()
}
func TestPopulateDefsInOpenAPI_Substitution(t *testing.T) {
@@ -271,9 +265,11 @@ openAPI:
t.FailNow()
}
if !assert.NoError(t, AddSchemaFromFile(f.Name())) {
clean, err := AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
defer clean()
s, err := GetSchema(`{"$ref": "#/definitions/io.k8s.cli.substitutions.image"}`)
@@ -305,9 +301,11 @@ kind: Example
t.FailNow()
}
if !assert.NoError(t, AddSchemaFromFile(f.Name())) {
clean, err := AddSchemaFromFile(f.Name())
if !assert.NoError(t, err) {
t.FailNow()
}
defer clean()
if !assert.Equal(t, len(globalSchema.schema.Definitions), 0) {
t.FailNow()