From 5949e6279d52306b08e16eee64b5e1cf777c20cb Mon Sep 17 00:00:00 2001
From: Sargun Dhillon <sargun@sargun.me>
Date: Tue, 3 Sep 2019 10:23:19 -0700
Subject: [PATCH] Miscellaneous cleanup for linting

---
 internal/manager/resource_test.go | 14 +++++++-------
 node/lifecycle_test.go            |  2 +-
 node/mock_test.go                 |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/manager/resource_test.go b/internal/manager/resource_test.go
index 030a1d861..c28581674 100644
--- a/internal/manager/resource_test.go
+++ b/internal/manager/resource_test.go
@@ -17,13 +17,13 @@ package manager_test
 import (
 	"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"
 	"k8s.io/apimachinery/pkg/api/errors"
 	corev1listers "k8s.io/client-go/listers/core/v1"
 	"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.
@@ -38,7 +38,7 @@ func TestGetPods(t *testing.T) {
 	// Create a pod lister that will list the pods defined above.
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	for _, pod := range lsPods {
-		indexer.Add(pod)
+		assert.NilError(t, indexer.Add(pod))
 	}
 	podLister := corev1listers.NewPodLister(indexer)
 
@@ -67,7 +67,7 @@ func TestGetSecret(t *testing.T) {
 	// Create a secret lister that will list the secrets defined above.
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	for _, secret := range lsSecrets {
-		indexer.Add(secret)
+		assert.NilError(t, indexer.Add(secret))
 	}
 	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.
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	for _, secret := range lsConfigMaps {
-		indexer.Add(secret)
+		assert.NilError(t, indexer.Add(secret))
 	}
 	configMapLister := corev1listers.NewConfigMapLister(indexer)
 
@@ -145,7 +145,7 @@ func TestListServices(t *testing.T) {
 	// Create a pod lister that will list the pods defined above.
 	indexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
 	for _, service := range lsServices {
-		indexer.Add(service)
+		assert.NilError(t, indexer.Add(service))
 	}
 	serviceLister := corev1listers.NewServiceLister(indexer)
 
diff --git a/node/lifecycle_test.go b/node/lifecycle_test.go
index 1bc07800e..c10cc10ba 100644
--- a/node/lifecycle_test.go
+++ b/node/lifecycle_test.go
@@ -23,11 +23,11 @@ import (
 	kubeinformers "k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	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/record"
 	watchutils "k8s.io/client-go/tools/watch"
 	"k8s.io/klog"
-	ktesting "k8s.io/client-go/testing"
 )
 
 var (
diff --git a/node/mock_test.go b/node/mock_test.go
index 62ec97329..3ff7cebb7 100644
--- a/node/mock_test.go
+++ b/node/mock_test.go
@@ -58,7 +58,7 @@ func (w *waitableInt) until(ctx context.Context, f func(int) bool) error {
 func (w *waitableInt) increment() {
 	w.cond.L.Lock()
 	defer w.cond.L.Unlock()
-	w.val += 1
+	w.val++
 	w.cond.Broadcast()
 }