github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #77442 from cofyc/fix77084

Browse Source 
Fix go lint failures in volume scheduling packages
This commit is contained in:
Kubernetes Prow Robot
2019-05-07 00:24:07 -07:00
committed by GitHub
parent 5b34d95ec5 4abd73048c
commit 43284ecbfc
10 changed files with 80 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/controller/volume/persistentvolume/framework_test.go
View File

@@ -688,7 +688,7 @@ func runMultisyncTests(t *testing.T, tests []controllerTest, storageClasses []*s
obj := reactor.PopChange()
if obj == nil {
// Nothing was changed, should we exit?
if firstSync || reactor.ChangedSinceLastSync() > 0 {
if firstSync || reactor.GetChangeCount() > 0 {
// There were some changes after the last "periodic sync".
// Simulate "periodic sync" of everything (until it produces
// no changes).
@@ -712,7 +712,7 @@ func runMultisyncTests(t *testing.T, tests []controllerTest, storageClasses []*s
ctrl.claims.Update(claim)
err = ctrl.syncClaim(claim)
if err != nil {
if err == pvtesting.VersionConflictError {
if err == pvtesting.ErrVersionConflict {
// Ignore version errors
klog.V(4).Infof("test intentionaly ignores version error.")
} else {
@@ -729,7 +729,7 @@ func runMultisyncTests(t *testing.T, tests []controllerTest, storageClasses []*s
ctrl.volumes.store.Update(volume)
err = ctrl.syncVolume(volume)
if err != nil {
if err == pvtesting.VersionConflictError {
if err == pvtesting.ErrVersionConflict {
// Ignore version errors
klog.V(4).Infof("test intentionaly ignores version error.")
} else {