scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #97779 from tiloso/staticcheck-test-integration-gs

Browse Source 
Fix staticcheck in test/integration/{garbagecollector,scheduler_perf}
This commit is contained in:
Kubernetes Prow Robot
2021-03-10 16:04:23 -08:00
committed by GitHub
parent a5b5a685ec e1ceac0783
commit 23af91b293
3 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/.staticcheck_failures
View File

@@ -1,8 +1,6 @@
cluster/images/etcd/migrate cluster/images/etcd/migrate
pkg/controller/replicaset pkg/controller/replicaset
pkg/kubelet/dockershim pkg/kubelet/dockershim
test/integration/garbagecollector
test/integration/scheduler_perf
vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip vendor/k8s.io/apimachinery/pkg/api/apitesting/roundtrip
vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation
vendor/k8s.io/apimachinery/pkg/runtime/serializer/json vendor/k8s.io/apimachinery/pkg/runtime/serializer/json

8
test/integration/garbagecollector/garbage_collector_test.go
View File

@@ -598,6 +598,7 @@ func setupRCsPods(t *testing.T, gc *garbagecollector.GarbageCollector, clientSet
} }
orphan := false orphan := false
switch { switch {
//lint:file-ignore SA1019 Keep testing deprecated OrphanDependents option until it's being removed
case options.OrphanDependents == nil && options.PropagationPolicy == nil && len(initialFinalizers) == 0: case options.OrphanDependents == nil && options.PropagationPolicy == nil && len(initialFinalizers) == 0:
// if there are no deletion options, the default policy for replication controllers is orphan // if there are no deletion options, the default policy for replication controllers is orphan
orphan = true orphan = true
@@ -1024,12 +1025,7 @@ func TestBlockingOwnerRefDoesBlock(t *testing.T) {
// dependency graph before handling the foreground deletion of the rc. // dependency graph before handling the foreground deletion of the rc.
ctx.startGC(5) ctx.startGC(5)
timeout := make(chan struct{}) timeout := make(chan struct{})
go func() { time.AfterFunc(5*time.Second, func() { close(timeout) })
select {
case <-time.After(5 * time.Second):
close(timeout)
}
}()
if !cache.WaitForCacheSync(timeout, gc.IsSynced) { if !cache.WaitForCacheSync(timeout, gc.IsSynced) {
t.Fatalf("failed to wait for garbage collector to be synced") t.Fatalf("failed to wait for garbage collector to be synced")
} }

3
test/integration/scheduler_perf/scheduler_perf_legacy_test.go
View File

@@ -439,6 +439,7 @@ func benchmarkScheduling(numExistingPods, minPods int,
testPodStrategy testutils.TestPodCreateStrategy, testPodStrategy testutils.TestPodCreateStrategy,
b *testing.B) { b *testing.B) {
if b.N < minPods { if b.N < minPods {
//lint:ignore SA3001 Set a minimum for b.N to get more meaningful results
b.N = minPods b.N = minPods
} }
finalFunc, podInformer, clientset := mustSetupScheduler() finalFunc, podInformer, clientset := mustSetupScheduler()
@@ -498,7 +499,7 @@ func benchmarkScheduling(numExistingPods, minPods int,
b.StopTimer() b.StopTimer()
} }
// makeBasePodWithSecrets creates a Pod object to be used as a template. // makeBasePodWithSecret creates a Pod object to be used as a template.
// The pod uses a single Secrets volume. // The pod uses a single Secrets volume.
func makeBasePodWithSecret() *v1.Pod { func makeBasePodWithSecret() *v1.Pod {
basePod := &v1.Pod{ basePod := &v1.Pod{