Skip to content

Commit e42aea2

Browse files
danilrwxdanilrwx
committed
fix tests
Signed-off-by: Daniil Antoshin <daniil.antoshin@flant.com>
1 parent 2376006 commit e42aea2

File tree

1 file changed

+35
-17
lines changed
  • images/virtualization-artifact/pkg/controller/vd/internal

1 file changed

+35
-17
lines changed

‎images/virtualization-artifact/pkg/controller/vd/internal/inuse_test.go‎

Lines changed: 35 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
2828
virtv1 "kubevirt.io/api/core/v1"
2929
ctrl "sigs.k8s.io/controller-runtime"
30-
"sigs.k8s.io/controller-runtime/pkg/client/fake"
3130

3231
"github.com/deckhouse/virtualization-controller/pkg/common/annotations"
32+
"github.com/deckhouse/virtualization-controller/pkg/common/testutil"
3333
"github.com/deckhouse/virtualization-controller/pkg/controller/conditions"
3434
"github.com/deckhouse/virtualization/api/core/v1alpha2"
3535
"github.com/deckhouse/virtualization/api/core/v1alpha2/vdcondition"
@@ -150,7 +150,8 @@ var _ = Describe("InUseHandler", func() {
150150
},
151151
}
152152

153-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm, vm2, vm3).Build()
153+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm, vm2, vm3)
154+
Expect(err).ToNot(HaveOccurred())
154155
handler = &InUseHandler{client: k8sClient}
155156

156157
result, err := handler.Handle(ctx, vd)
@@ -215,7 +216,9 @@ var _ = Describe("InUseHandler", func() {
215216
},
216217
}
217218

218-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
219+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
220+
Expect(err).ToNot(HaveOccurred())
221+
219222
handler = &InUseHandler{client: k8sClient}
220223

221224
result, err := handler.Handle(ctx, vd)
@@ -243,7 +246,8 @@ var _ = Describe("InUseHandler", func() {
243246
},
244247
}
245248

246-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
249+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
250+
Expect(err).ToNot(HaveOccurred())
247251
handler = &InUseHandler{client: k8sClient}
248252

249253
result, err := handler.Handle(ctx, vd)
@@ -272,7 +276,9 @@ var _ = Describe("InUseHandler", func() {
272276
},
273277
}
274278

275-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
279+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
280+
Expect(err).ToNot(HaveOccurred())
281+
276282
handler = &InUseHandler{client: k8sClient}
277283

278284
result, err := handler.Handle(ctx, vd)
@@ -300,7 +306,8 @@ var _ = Describe("InUseHandler", func() {
300306
},
301307
}
302308

303-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
309+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
310+
Expect(err).ToNot(HaveOccurred())
304311
handler = NewInUseHandler(k8sClient)
305312

306313
result, err := handler.Handle(ctx, vd)
@@ -331,7 +338,8 @@ var _ = Describe("InUseHandler", func() {
331338
}
332339
vd.Generation = 3
333340

334-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
341+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
342+
Expect(err).ToNot(HaveOccurred())
335343
handler = NewInUseHandler(k8sClient)
336344

337345
result, err := handler.Handle(ctx, vd)
@@ -380,7 +388,8 @@ var _ = Describe("InUseHandler", func() {
380388
},
381389
}
382390

383-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
391+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
392+
Expect(err).ToNot(HaveOccurred())
384393
handler = NewInUseHandler(k8sClient)
385394

386395
result, err := handler.Handle(ctx, vd)
@@ -431,7 +440,8 @@ var _ = Describe("InUseHandler", func() {
431440
},
432441
}
433442

434-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
443+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
444+
Expect(err).ToNot(HaveOccurred())
435445
handler = NewInUseHandler(k8sClient)
436446

437447
result, err := handler.Handle(ctx, vd)
@@ -477,7 +487,8 @@ var _ = Describe("InUseHandler", func() {
477487
},
478488
}
479489

480-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi).Build()
490+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi)
491+
Expect(err).ToNot(HaveOccurred())
481492
handler = NewInUseHandler(k8sClient)
482493

483494
result, err := handler.Handle(ctx, vd)
@@ -525,7 +536,8 @@ var _ = Describe("InUseHandler", func() {
525536
},
526537
}
527538

528-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, cvi).Build()
539+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, cvi)
540+
Expect(err).ToNot(HaveOccurred())
529541
handler = NewInUseHandler(k8sClient)
530542

531543
result, err := handler.Handle(ctx, vd)
@@ -587,7 +599,8 @@ var _ = Describe("InUseHandler", func() {
587599
},
588600
}
589601

590-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi, vm).Build()
602+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi, vm)
603+
Expect(err).ToNot(HaveOccurred())
591604
handler = NewInUseHandler(k8sClient)
592605

593606
result, err := handler.Handle(ctx, vd)
@@ -635,7 +648,8 @@ var _ = Describe("InUseHandler", func() {
635648
},
636649
}
637650

638-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vm).Build()
651+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vm)
652+
Expect(err).ToNot(HaveOccurred())
639653
handler = NewInUseHandler(k8sClient)
640654

641655
result, err := handler.Handle(ctx, vd)
@@ -688,7 +702,8 @@ var _ = Describe("InUseHandler", func() {
688702
},
689703
}
690704

691-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, vi).Build()
705+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, vi)
706+
Expect(err).ToNot(HaveOccurred())
692707
handler = NewInUseHandler(k8sClient)
693708

694709
result, err := handler.Handle(ctx, vd)
@@ -720,7 +735,8 @@ var _ = Describe("InUseHandler", func() {
720735
},
721736
}
722737

723-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
738+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
739+
Expect(err).ToNot(HaveOccurred())
724740
handler = NewInUseHandler(k8sClient)
725741

726742
result, err := handler.Handle(ctx, vd)
@@ -752,7 +768,8 @@ var _ = Describe("InUseHandler", func() {
752768
},
753769
}
754770

755-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd).Build()
771+
k8sClient, err := testutil.NewFakeClientWithObjects(vd)
772+
Expect(err).ToNot(HaveOccurred())
756773
handler = NewInUseHandler(k8sClient)
757774

758775
result, err := handler.Handle(ctx, vd)
@@ -792,7 +809,8 @@ var _ = Describe("InUseHandler", func() {
792809
},
793810
}
794811

795-
k8sClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(vd, pvc).Build()
812+
k8sClient, err := testutil.NewFakeClientWithObjects(vd, pvc)
813+
Expect(err).ToNot(HaveOccurred())
796814
handler = NewInUseHandler(k8sClient)
797815

798816
result, err := handler.Handle(ctx, vd)

0 commit comments

Comments
 (0)