github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Remove setupInformer argument from test CSI plugin constructor

Browse Source
This commit is contained in:
Chris Henzie 2020-12-23 19:45:54 -08:00
parent 70eddfefec
commit 257704b30d
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/volume/csi/BUILD
View File

@ -85,10 +85,8 @@ go_test(
"//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/watch:go_default_library",
"//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
"//staging/src/k8s.io/client-go/informers:go_default_library", "//staging/src/k8s.io/client-go/informers:go_default_library",
"//staging/src/k8s.io/client-go/informers/storage/v1:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//staging/src/k8s.io/client-go/kubernetes:go_default_library",
"//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library", "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",
"//staging/src/k8s.io/client-go/listers/storage/v1:go_default_library",
"//staging/src/k8s.io/client-go/testing:go_default_library", "//staging/src/k8s.io/client-go/testing:go_default_library",
"//staging/src/k8s.io/client-go/util/testing:go_default_library", "//staging/src/k8s.io/client-go/util/testing:go_default_library",
"//staging/src/k8s.io/component-base/featuregate/testing:go_default_library", "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",

34
pkg/volume/csi/csi_attacher_test.go
View File

@ -38,10 +38,8 @@ import (
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
"k8s.io/client-go/informers" "k8s.io/client-go/informers"
storageinformer "k8s.io/client-go/informers/storage/v1"
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
fakeclient "k8s.io/client-go/kubernetes/fake" fakeclient "k8s.io/client-go/kubernetes/fake"
storagelister "k8s.io/client-go/listers/storage/v1"
core "k8s.io/client-go/testing" core "k8s.io/client-go/testing"
utiltesting "k8s.io/client-go/util/testing" utiltesting "k8s.io/client-go/util/testing"
featuregatetesting "k8s.io/component-base/featuregate/testing" featuregatetesting "k8s.io/component-base/featuregate/testing"
@ -203,7 +201,7 @@ func TestAttacherAttach(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
t.Logf("test case: %s", tc.name) t.Logf("test case: %s", tc.name)
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -294,7 +292,7 @@ func TestAttacherAttachWithInline(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
t.Logf("test case: %s", tc.name) t.Logf("test case: %s", tc.name)
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -369,7 +367,7 @@ func TestAttacherWithCSIDriver(t *testing.T) {
getTestCSIDriver("attachable", nil, &bTrue, nil), getTestCSIDriver("attachable", nil, &bTrue, nil),
getTestCSIDriver("nil", nil, nil, nil), getTestCSIDriver("nil", nil, nil, nil),
) )
plug, tmpDir, _ := newTestWatchPlugin(t, fakeClient, true) plug, tmpDir, _ := newTestWatchPlugin(t, fakeClient)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
attachmentWatchCreated := make(chan core.Action) attachmentWatchCreated := make(chan core.Action)
@ -554,7 +552,7 @@ func TestAttacherWaitForAttach(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
plug, tmpDir, _ := newTestWatchPlugin(t, nil, true) plug, tmpDir, _ := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
attacher, err := plug.NewAttacher() attacher, err := plug.NewAttacher()
@ -636,7 +634,7 @@ func TestAttacherWaitForAttachWithInline(t *testing.T) {
for _, test := range tests { for _, test := range tests {
t.Run(test.name, func(t *testing.T) { t.Run(test.name, func(t *testing.T) {
plug, tmpDir, _ := newTestWatchPlugin(t, nil, true) plug, tmpDir, _ := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
attacher, err := plug.NewAttacher() attacher, err := plug.NewAttacher()
@ -723,7 +721,7 @@ func TestAttacherWaitForVolumeAttachment(t *testing.T) {
for i, tc := range testCases { for i, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -988,7 +986,7 @@ func TestAttacherDetach(t *testing.T) {
for _, tc := range testCases { for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
t.Logf("running test: %v", tc.name) t.Logf("running test: %v", tc.name)
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -1052,7 +1050,7 @@ func TestAttacherDetach(t *testing.T) {
func TestAttacherGetDeviceMountPath(t *testing.T) { func TestAttacherGetDeviceMountPath(t *testing.T) {
// Setup // Setup
// Create a new attacher // Create a new attacher
plug, tmpDir, _ := newTestWatchPlugin(t, nil, true) plug, tmpDir, _ := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
attacher, err0 := plug.NewAttacher() attacher, err0 := plug.NewAttacher()
if err0 != nil { if err0 != nil {
@ -1217,7 +1215,7 @@ func TestAttacherMountDevice(t *testing.T) {
// Setup // Setup
// Create a new attacher // Create a new attacher
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -1389,7 +1387,7 @@ func TestAttacherMountDeviceWithInline(t *testing.T) {
// Setup // Setup
// Create a new attacher // Create a new attacher
plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil, false) plug, tmpDir, fakeClient := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
fakeWatcher := watch.NewRaceFreeFake() fakeWatcher := watch.NewRaceFreeFake()
@ -1528,7 +1526,7 @@ func TestAttacherUnmountDevice(t *testing.T) {
t.Logf("Running test case: %s", tc.testName) t.Logf("Running test case: %s", tc.testName)
// Setup // Setup
// Create a new attacher // Create a new attacher
plug, tmpDir, _ := newTestWatchPlugin(t, nil, true) plug, tmpDir, _ := newTestWatchPlugin(t, nil)
defer os.RemoveAll(tmpDir) defer os.RemoveAll(tmpDir)
attacher, err0 := plug.NewAttacher() attacher, err0 := plug.NewAttacher()
if err0 != nil { if err0 != nil {
@ -1615,7 +1613,7 @@ func TestAttacherUnmountDevice(t *testing.T) {
} }
// create a plugin mgr to load plugins and setup a fake client // create a plugin mgr to load plugins and setup a fake client
func newTestWatchPlugin(t *testing.T, fakeClient *fakeclient.Clientset, setupInformer bool) (*csiPlugin, string, *fakeclient.Clientset) { func newTestWatchPlugin(t *testing.T, fakeClient *fakeclient.Clientset) (*csiPlugin, string, *fakeclient.Clientset) {
tmpDir, err := utiltesting.MkTmpdir("csi-test") tmpDir, err := utiltesting.MkTmpdir("csi-test")
if err != nil { if err != nil {
t.Fatalf("can't create temp dir: %v", err) t.Fatalf("can't create temp dir: %v", err)
@ -1635,12 +1633,8 @@ func newTestWatchPlugin(t *testing.T, fakeClient *fakeclient.Clientset, setupInf
factory := informers.NewSharedInformerFactory(fakeClient, CsiResyncPeriod) factory := informers.NewSharedInformerFactory(fakeClient, CsiResyncPeriod)
csiDriverInformer := factory.Storage().V1().CSIDrivers() csiDriverInformer := factory.Storage().V1().CSIDrivers()
csiDriverLister := csiDriverInformer.Lister() csiDriverLister := csiDriverInformer.Lister()
var volumeAttachmentInformer storageinformer.VolumeAttachmentInformer volumeAttachmentInformer := factory.Storage().V1().VolumeAttachments()
var volumeAttachmentLister storagelister.VolumeAttachmentLister volumeAttachmentLister := volumeAttachmentInformer.Lister()
if setupInformer {
volumeAttachmentInformer = factory.Storage().V1().VolumeAttachments()
volumeAttachmentLister = volumeAttachmentInformer.Lister()
}
factory.Start(wait.NeverStop) factory.Start(wait.NeverStop)
ctx, cancel := context.WithTimeout(context.Background(), TestInformerSyncTimeout) ctx, cancel := context.WithTimeout(context.Background(), TestInformerSyncTimeout)