kubernetes
/
apiserver
mirror of https://github.com/kubernetes/apiserver.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Drop null creationTimestamp from test fixtures 

Kubernetes-commit: 6bb6c9934294d8265197c9dfc4c9dd3adaca147a
This commit is contained in:
Jordan Liggitt 2025-03-24 09:37:26 -04:00 committed by Kubernetes Publisher
parent b5e431bd82
commit 0d11839195
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/endpoints/apiserver_test.go
View File

@ -4044,26 +4044,24 @@ func TestFieldValidation(t *testing.T) {
var ( var (
strictDecodingErr = `strict decoding error: duplicate field \"other\", unknown field \"unknown\"` strictDecodingErr = `strict decoding error: duplicate field \"other\", unknown field \"unknown\"`
strictDecodingWarns = []string{`duplicate field "other"`, `unknown field "unknown"`} strictDecodingWarns = []string{`duplicate field "other"`, `unknown field "unknown"`}
strictDecodingErrYAML = `strict decoding error: yaml: unmarshal errors:\n line 6: key \"other\" already set in map, unknown field \"unknown\"` strictDecodingErrYAML = `strict decoding error: yaml: unmarshal errors:\n line 5: key \"other\" already set in map, unknown field \"unknown\"`
strictDecodingWarnsYAML = []string{`line 6: key "other" already set in map`, `unknown field "unknown"`} strictDecodingWarnsYAML = []string{`line 5: key "other" already set in map`, `unknown field "unknown"`}
strictDecodingErrYAMLPut = `strict decoding error: yaml: unmarshal errors:\n line 7: key \"other\" already set in map, unknown field \"unknown\"` strictDecodingErrYAMLPut = `strict decoding error: yaml: unmarshal errors:\n line 6: key \"other\" already set in map, unknown field \"unknown\"`
strictDecodingWarnsYAMLPut = []string{`line 7: key "other" already set in map`, `unknown field "unknown"`} strictDecodingWarnsYAMLPut = []string{`line 6: key "other" already set in map`, `unknown field "unknown"`}
invalidJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"creationTimestamp":null}, "other":"foo","other":"bar","unknown":"baz"}`) invalidJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{}, "other":"foo","other":"bar","unknown":"baz"}`)
invalidYAMLDataPost = []byte(`apiVersion: test.group/version invalidYAMLDataPost = []byte(`apiVersion: test.group/version
kind: Simple kind: Simple
metadata: metadata: {}
creationTimestamp: null
other: foo other: foo
other: bar other: bar
unknown: baz`) unknown: baz`)
invalidJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id", "creationTimestamp":null}, "other":"foo","other":"bar","unknown":"baz"}`) invalidJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id"}, "other":"foo","other":"bar","unknown":"baz"}`)
invalidYAMLDataPut = []byte(`apiVersion: test.group/version invalidYAMLDataPut = []byte(`apiVersion: test.group/version
kind: Simple kind: Simple
metadata: metadata:
name: id name: id
creationTimestamp: null
other: foo other: foo
other: bar other: bar
unknown: baz`) unknown: baz`)
@ -4180,19 +4178,17 @@ unknown: baz`)
// strict, warn, and ignore field validation handling. // strict, warn, and ignore field validation handling.
func BenchmarkFieldValidation(b *testing.B) { func BenchmarkFieldValidation(b *testing.B) {
var ( var (
validJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"creationTimestamp":null}, "other":"foo"}`) validJSONDataPost = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{}, "other":"foo"}`)
validYAMLDataPost = []byte(`apiVersion: test.group/version validYAMLDataPost = []byte(`apiVersion: test.group/version
kind: Simple kind: Simple
metadata: metadata: {}
creationTimestamp: null
other: foo`) other: foo`)
validJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id", "creationTimestamp":null}, "other":"bar"}`) validJSONDataPut = []byte(`{"kind":"Simple", "apiVersion":"test.group/version", "metadata":{"name":"id"}, "other":"bar"}`)
validYAMLDataPut = []byte(`apiVersion: test.group/version validYAMLDataPut = []byte(`apiVersion: test.group/version
kind: Simple kind: Simple
metadata: metadata:
name: id name: id
creationTimestamp: null
other: bar`) other: bar`)
validMergePatch = []byte(`{"labels":{"foo":"bar"}, "other": "bar"}`) validMergePatch = []byte(`{"labels":{"foo":"bar"}, "other": "bar"}`)