Unverified Commit 0b62ad23 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub

Merge pull request #72959 from cofyc/fix72954

Fix flaky test TestBindAPIUpdate
parents 2300d7d9 f406c6bd
...@@ -467,7 +467,10 @@ func (env *testEnv) validateBind( ...@@ -467,7 +467,10 @@ func (env *testEnv) validateBind(
if err != nil { if err != nil {
t.Errorf("Test %q failed: GetPV %q returned error: %v", name, pv.Name, err) t.Errorf("Test %q failed: GetPV %q returned error: %v", name, pv.Name, err)
} }
if !reflect.DeepEqual(cachedPV, pv) { // Cache may be overridden by API object with higher version, compare but ignore resource version.
newCachedPV := cachedPV.DeepCopy()
newCachedPV.ResourceVersion = pv.ResourceVersion
if !reflect.DeepEqual(newCachedPV, pv) {
t.Errorf("Test %q failed: cached PV check failed [A-expected, B-got]:\n%s", name, diff.ObjectDiff(pv, cachedPV)) t.Errorf("Test %q failed: cached PV check failed [A-expected, B-got]:\n%s", name, diff.ObjectDiff(pv, cachedPV))
} }
} }
...@@ -492,7 +495,10 @@ func (env *testEnv) validateProvision( ...@@ -492,7 +495,10 @@ func (env *testEnv) validateProvision(
if err != nil { if err != nil {
t.Errorf("Test %q failed: GetPVC %q returned error: %v", name, getPVCName(pvc), err) t.Errorf("Test %q failed: GetPVC %q returned error: %v", name, getPVCName(pvc), err)
} }
if !reflect.DeepEqual(cachedPVC, pvc) { // Cache may be overridden by API object with higher version, compare but ignore resource version.
newCachedPVC := cachedPVC.DeepCopy()
newCachedPVC.ResourceVersion = pvc.ResourceVersion
if !reflect.DeepEqual(newCachedPVC, pvc) {
t.Errorf("Test %q failed: cached PVC check failed [A-expected, B-got]:\n%s", name, diff.ObjectDiff(pvc, cachedPVC)) t.Errorf("Test %q failed: cached PVC check failed [A-expected, B-got]:\n%s", name, diff.ObjectDiff(pvc, cachedPVC))
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment