github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Pass locks by pointer instead of by value

Browse Source
This commit is contained in:
Yang Li 2018-11-18 18:48:14 +08:00
parent 43f9302b90
commit 3d9e2f09d0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/patch_test.go
View File

@ -282,7 +282,7 @@ testCases:
func TestSortMergeLists(t *testing.T) { func TestSortMergeLists(t *testing.T) {
mergeItemOpenapiSchema := PatchMetaFromOpenAPI{ mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"), Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
} }
schemas := []LookupPatchMeta{ schemas := []LookupPatchMeta{
mergeItemStructSchema, mergeItemStructSchema,
@ -673,7 +673,7 @@ mergingList:
func TestCustomStrategicMergePatch(t *testing.T) { func TestCustomStrategicMergePatch(t *testing.T) {
mergeItemOpenapiSchema := PatchMetaFromOpenAPI{ mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"), Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
} }
schemas := []LookupPatchMeta{ schemas := []LookupPatchMeta{
mergeItemStructSchema, mergeItemStructSchema,
@ -6029,7 +6029,7 @@ func TestStrategicMergePatch(t *testing.T) {
"{}", "{}", []byte("<THIS IS NOT A STRUCT>"), mergepatch.ErrBadArgKind(struct{}{}, []byte{})) "{}", "{}", []byte("<THIS IS NOT A STRUCT>"), mergepatch.ErrBadArgKind(struct{}{}, []byte{}))
mergeItemOpenapiSchema := PatchMetaFromOpenAPI{ mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"), Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
} }
schemas := []LookupPatchMeta{ schemas := []LookupPatchMeta{
mergeItemStructSchema, mergeItemStructSchema,
@ -6413,7 +6413,7 @@ func TestNumberConversion(t *testing.T) {
} }
precisionItemOpenapiSchema := PatchMetaFromOpenAPI{ precisionItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakePrecisionItemSchema, "precisionItem"), Schema: sptest.GetSchemaOrDie(&fakePrecisionItemSchema, "precisionItem"),
} }
precisionItemSchemas := []LookupPatchMeta{ precisionItemSchemas := []LookupPatchMeta{
precisionItemStructSchema, precisionItemStructSchema,
@ -6623,7 +6623,7 @@ replacingItem:
func TestReplaceWithRawExtension(t *testing.T) { func TestReplaceWithRawExtension(t *testing.T) {
mergeItemOpenapiSchema := PatchMetaFromOpenAPI{ mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"), Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
} }
schemas := []LookupPatchMeta{ schemas := []LookupPatchMeta{
mergeItemStructSchema, mergeItemStructSchema,
@ -6695,7 +6695,7 @@ func TestUnknownField(t *testing.T) {
} }
mergeItemOpenapiSchema := PatchMetaFromOpenAPI{ mergeItemOpenapiSchema := PatchMetaFromOpenAPI{
Schema: sptest.GetSchemaOrDie(fakeMergeItemSchema, "mergeItem"), Schema: sptest.GetSchemaOrDie(&fakeMergeItemSchema, "mergeItem"),
} }
schemas := []LookupPatchMeta{ schemas := []LookupPatchMeta{
mergeItemStructSchema, mergeItemStructSchema,

4
staging/src/k8s.io/apimachinery/pkg/util/strategicpatch/testing/openapi.go
View File

@ -62,7 +62,7 @@ func (f *Fake) OpenAPISchema() (*openapi_v2.Document, error) {
return f.document, f.err return f.document, f.err
} }
func getSchema(f Fake, model string) (openapi.Schema, error) { func getSchema(f *Fake, model string) (openapi.Schema, error) {
s, err := f.OpenAPISchema() s, err := f.OpenAPISchema()
if err != nil { if err != nil {
return nil, err return nil, err
@ -75,7 +75,7 @@ func getSchema(f Fake, model string) (openapi.Schema, error) {
} }
// GetSchemaOrDie returns the openapi schema. // GetSchemaOrDie returns the openapi schema.
func GetSchemaOrDie(f Fake, model string) openapi.Schema { func GetSchemaOrDie(f *Fake, model string) openapi.Schema {
s, err := getSchema(f, model) s, err := getSchema(f, model)
if err != nil { if err != nil {
panic(err) panic(err)