Miscellaneous cleanup for linting

This commit is contained in:
Sargun Dhillon
2019-09-03 10:23:19 -07:00
parent 9cce8640a5
commit 5949e6279d
3 changed files with 9 additions and 9 deletions

View File

@@ -17,13 +17,13 @@ package manager_test
import ( import (
"testing" "testing"
"github.com/virtual-kubelet/virtual-kubelet/internal/manager"
testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
"gotest.tools/assert"
v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/errors"
corev1listers "k8s.io/client-go/listers/core/v1" corev1listers "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"github.com/virtual-kubelet/virtual-kubelet/internal/manager"
testutil "github.com/virtual-kubelet/virtual-kubelet/internal/test/util"
) )
// TestGetPods verifies that the resource manager acts as a passthrough to a pod lister. // TestGetPods verifies that the resource manager acts as a passthrough to a pod lister.
@@ -38,7 +38,7 @@ func TestGetPods(t *testing.T) {
// Create a pod lister that will list the pods defined above. // Create a pod lister that will list the pods defined above.
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
for _, pod := range lsPods { for _, pod := range lsPods {
indexer.Add(pod) assert.NilError(t, indexer.Add(pod))
} }
podLister := corev1listers.NewPodLister(indexer) podLister := corev1listers.NewPodLister(indexer)
@@ -67,7 +67,7 @@ func TestGetSecret(t *testing.T) {
// Create a secret lister that will list the secrets defined above. // Create a secret lister that will list the secrets defined above.
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
for _, secret := range lsSecrets { for _, secret := range lsSecrets {
indexer.Add(secret) assert.NilError(t, indexer.Add(secret))
} }
secretLister := corev1listers.NewSecretLister(indexer) secretLister := corev1listers.NewSecretLister(indexer)
@@ -106,7 +106,7 @@ func TestGetConfigMap(t *testing.T) {
// Create a config map lister that will list the config maps defined above. // Create a config map lister that will list the config maps defined above.
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
for _, secret := range lsConfigMaps { for _, secret := range lsConfigMaps {
indexer.Add(secret) assert.NilError(t, indexer.Add(secret))
} }
configMapLister := corev1listers.NewConfigMapLister(indexer) configMapLister := corev1listers.NewConfigMapLister(indexer)
@@ -145,7 +145,7 @@ func TestListServices(t *testing.T) {
// Create a pod lister that will list the pods defined above. // Create a pod lister that will list the pods defined above.
indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}) indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
for _, service := range lsServices { for _, service := range lsServices {
indexer.Add(service) assert.NilError(t, indexer.Add(service))
} }
serviceLister := corev1listers.NewServiceLister(indexer) serviceLister := corev1listers.NewServiceLister(indexer)

View File

@@ -23,11 +23,11 @@ import (
kubeinformers "k8s.io/client-go/informers" kubeinformers "k8s.io/client-go/informers"
"k8s.io/client-go/kubernetes/fake" "k8s.io/client-go/kubernetes/fake"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1" corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
ktesting "k8s.io/client-go/testing"
"k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/cache"
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
watchutils "k8s.io/client-go/tools/watch" watchutils "k8s.io/client-go/tools/watch"
"k8s.io/klog" "k8s.io/klog"
ktesting "k8s.io/client-go/testing"
) )
var ( var (

View File

@@ -58,7 +58,7 @@ func (w *waitableInt) until(ctx context.Context, f func(int) bool) error {
func (w *waitableInt) increment() { func (w *waitableInt) increment() {
w.cond.L.Lock() w.cond.L.Lock()
defer w.cond.L.Unlock() defer w.cond.L.Unlock()
w.val += 1 w.val++
w.cond.Broadcast() w.cond.Broadcast()
} }