github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #72959 from cofyc/fix72954 

Fix flaky test TestBindAPIUpdate
pull/564/head
Kubernetes Prow Robot 2019-01-22 11:12:59 -08:00 committed by GitHub
parent 2300d7d923 f406c6bde7
commit 0b62ad23c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/controller/volume/persistentvolume/scheduler_binder_test.go
View File

@ -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(
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))
} }
} }