github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Revise according to review

Browse Source
This commit is contained in:
Mike Spreitzer 2022-08-29 23:02:29 -04:00
parent 98acbc3692
commit d3081b378a
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
test/integration/apiserver/apply/reset_fields_test.go
View File

@ -277,7 +277,10 @@ func TestApplyResetFields(t *testing.T) {
Resource(mapping.Resource). Resource(mapping.Resource).
Namespace(namespace). Namespace(namespace).
Apply(context.TODO(), name, obj2, metav1.ApplyOptions{FieldManager: "fieldmanager2"}) Apply(context.TODO(), name, obj2, metav1.ApplyOptions{FieldManager: "fieldmanager2"})
expectConflict(t, objRet, err, dynamicClient, mapping.Resource, namespace, name, "spec") err = expectConflict(objRet, err, dynamicClient, mapping.Resource, namespace, name)
if err != nil {
t.Fatalf("Did not get expected conflict in spec of %s %s/%s: %v", mapping.Resource, namespace, name, err)
}
// reapply first object to the status endpoint // reapply first object to the status endpoint
// that should fail with a conflict // that should fail with a conflict
@ -285,7 +288,10 @@ func TestApplyResetFields(t *testing.T) {
Resource(mapping.Resource). Resource(mapping.Resource).
Namespace(namespace). Namespace(namespace).
ApplyStatus(context.TODO(), name, &obj1, metav1.ApplyOptions{FieldManager: "fieldmanager1"}) ApplyStatus(context.TODO(), name, &obj1, metav1.ApplyOptions{FieldManager: "fieldmanager1"})
expectConflict(t, objRet, err, dynamicClient, mapping.Resource, namespace, name, "status") err = expectConflict(objRet, err, dynamicClient, mapping.Resource, namespace, name)
if err != nil {
t.Fatalf("Did not get expected conflict in status of %s %s/%s: %v", mapping.Resource, namespace, name, err)
}
} }
// cleanup // cleanup
@ -298,30 +304,29 @@ func TestApplyResetFields(t *testing.T) {
} }
} }
func expectConflict(t *testing.T, objRet *unstructured.Unstructured, err error, dynamicClient dynamic.Interface, resource schema.GroupVersionResource, namespace, name, where string) { func expectConflict(objRet *unstructured.Unstructured, err error, dynamicClient dynamic.Interface, resource schema.GroupVersionResource, namespace, name string) error {
if err != nil && strings.Contains(err.Error(), "conflict") { if err != nil && strings.Contains(err.Error(), "conflict") {
return return nil
} }
which := "returned" which := "returned"
var gotten string // something unexpected is going on here, let's not assume that objRet==nil if any only if err!=nil
var err2 error
if objRet == nil { if objRet == nil {
which = "subsequently fetched" which = "subsequently fetched"
var err2 error
objRet, err2 = dynamicClient. objRet, err2 = dynamicClient.
Resource(resource). Resource(resource).
Namespace(namespace). Namespace(namespace).
Get(context.TODO(), name, metav1.GetOptions{}) Get(context.TODO(), name, metav1.GetOptions{})
if err2 != nil { if err2 != nil {
gotten = fmt.Sprintf("<failed to Get object: %v>", err2) return fmt.Errorf("instead got error %w, and failed to Get object: %v", err, err2)
} }
} }
if gotten == "" { marshBytes, marshErr := json.Marshal(objRet)
marshBytes, marshErr := json.Marshal(objRet) var gotten string
if marshErr == nil { if marshErr == nil {
gotten = string(marshBytes) gotten = string(marshBytes)
} else { } else {
gotten = fmt.Sprintf("<failed to json.Marshall(%#+v): %v>", objRet, marshErr) gotten = fmt.Sprintf("<failed to json.Marshall(%#+v): %v>", objRet, marshErr)
}
} }
t.Fatalf("expected conflict in %s, but instead got error %v; %s object is %s", where, err, which, gotten) return fmt.Errorf("instead got error %w; %s object is %s", err, which, gotten)
} }