Skip to content

Commit ab7a649

Browse files
harishsurfharishsurf
committed
Modify dynamic_resource_e2e_test to ginkgo
1 parent 3ba5db8 commit ab7a649

13 files changed

+563
-500
lines changed

‎go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -893,6 +893,7 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKf
893893
k8s.io/kubectl v0.17.2/go.mod h1:y4rfLV0n6aPmvbRCqZQjvOp3ezxsFgpqL+zF5jH/lxk=
894894
k8s.io/kubectl v0.17.3 h1:9HHYj07kuFkM+sMJMOyQX29CKWq4lvKAG1UIPxNPMQ4=
895895
k8s.io/kubectl v0.17.3/go.mod h1:NUn4IBY7f7yCMwSop2HCXlw/MVYP4HJBiUmOR3n9w28=
896+
k8s.io/kubernetes v1.13.0 h1:qTfB+u5M92k2fCCCVP2iuhgwwSOv1EkAkvQY1tQODD8=
896897
k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
897898
k8s.io/metrics v0.17.2/go.mod h1:3TkNHET4ROd+NfzNxkjoVfQ0Ob4iZnaHmSEA4vYpwLw=
898899
k8s.io/metrics v0.17.3/go.mod h1:HEJGy1fhHOjHggW9rMDBJBD3YuGroH3Y1pnIRw9FFaI=

‎test/e2e/catalog_e2e_test.go

Lines changed: 48 additions & 48 deletions
Large diffs are not rendered by default.

‎test/e2e/csv_e2e_test.go

Lines changed: 71 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333
var _ = Describe("CSV", func() {
3434
It("create with unmet requirements mini kube version", func() {
3535

36-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
36+
defer cleaner.NotifyTestComplete(true)
3737

38-
c := newKubeClient(GinkgoT())
39-
crc := newCRClient(GinkgoT())
38+
c := newKubeClient()
39+
crc := newCRClient()
4040

4141
depName := genName("dep-")
4242
csv := v1alpha1.ClusterServiceVersion{
@@ -85,10 +85,10 @@ var _ = Describe("CSV", func() {
8585
// TODO: same test but missing serviceaccount instead
8686
It("create with unmet requirements CRD", func() {
8787

88-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
88+
defer cleaner.NotifyTestComplete(true)
8989

90-
c := newKubeClient(GinkgoT())
91-
crc := newCRClient(GinkgoT())
90+
c := newKubeClient()
91+
crc := newCRClient()
9292

9393
depName := genName("dep-")
9494
csv := v1alpha1.ClusterServiceVersion{
@@ -147,10 +147,10 @@ var _ = Describe("CSV", func() {
147147
})
148148
It("create with unmet permissions CRD", func() {
149149

150-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
150+
defer cleaner.NotifyTestComplete(true)
151151

152-
c := newKubeClient(GinkgoT())
153-
crc := newCRClient(GinkgoT())
152+
c := newKubeClient()
153+
crc := newCRClient()
154154

155155
saName := genName("dep-")
156156
permissions := []v1alpha1.StrategyDeploymentPermissions{
@@ -257,10 +257,10 @@ var _ = Describe("CSV", func() {
257257
})
258258
It("create with unmet requirements API service", func() {
259259

260-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
260+
defer cleaner.NotifyTestComplete(true)
261261

262-
c := newKubeClient(GinkgoT())
263-
crc := newCRClient(GinkgoT())
262+
c := newKubeClient()
263+
crc := newCRClient()
264264

265265
depName := genName("dep-")
266266
csv := v1alpha1.ClusterServiceVersion{
@@ -319,10 +319,10 @@ var _ = Describe("CSV", func() {
319319
})
320320
It("create with unmet permissions API service", func() {
321321

322-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
322+
defer cleaner.NotifyTestComplete(true)
323323

324-
c := newKubeClient(GinkgoT())
325-
crc := newCRClient(GinkgoT())
324+
c := newKubeClient()
325+
crc := newCRClient()
326326

327327
saName := genName("dep-")
328328
permissions := []v1alpha1.StrategyDeploymentPermissions{
@@ -409,10 +409,10 @@ var _ = Describe("CSV", func() {
409409
})
410410
It("create with unmet requirements native API", func() {
411411

412-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
412+
defer cleaner.NotifyTestComplete(true)
413413

414-
c := newKubeClient(GinkgoT())
415-
crc := newCRClient(GinkgoT())
414+
c := newKubeClient()
415+
crc := newCRClient()
416416

417417
depName := genName("dep-")
418418
csv := v1alpha1.ClusterServiceVersion{
@@ -462,10 +462,10 @@ var _ = Describe("CSV", func() {
462462
// TODO: same test but create serviceaccount instead
463463
It("create requirements met CRD", func() {
464464

465-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
465+
defer cleaner.NotifyTestComplete(true)
466466

467-
c := newKubeClient(GinkgoT())
468-
crc := newCRClient(GinkgoT())
467+
c := newKubeClient()
468+
crc := newCRClient()
469469

470470
sa := corev1.ServiceAccount{}
471471
sa.SetName(genName("sa-"))
@@ -724,10 +724,10 @@ var _ = Describe("CSV", func() {
724724
})
725725
It("create requirements met API service", func() {
726726

727-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
727+
defer cleaner.NotifyTestComplete(true)
728728

729-
c := newKubeClient(GinkgoT())
730-
crc := newCRClient(GinkgoT())
729+
c := newKubeClient()
730+
crc := newCRClient()
731731

732732
sa := corev1.ServiceAccount{}
733733
sa.SetName(genName("sa-"))
@@ -887,10 +887,10 @@ var _ = Describe("CSV", func() {
887887
})
888888
It("create with owned API service", func() {
889889

890-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
890+
defer cleaner.NotifyTestComplete(true)
891891

892-
c := newKubeClient(GinkgoT())
893-
crc := newCRClient(GinkgoT())
892+
c := newKubeClient()
893+
crc := newCRClient()
894894

895895
depName := genName("hat-server")
896896
mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
@@ -1076,10 +1076,10 @@ var _ = Describe("CSV", func() {
10761076
})
10771077
It("update with owned API service", func() {
10781078

1079-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1079+
defer cleaner.NotifyTestComplete(true)
10801080

1081-
c := newKubeClient(GinkgoT())
1082-
crc := newCRClient(GinkgoT())
1081+
c := newKubeClient()
1082+
crc := newCRClient()
10831083

10841084
depName := genName("hat-server")
10851085
mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
@@ -1279,10 +1279,10 @@ var _ = Describe("CSV", func() {
12791279
})
12801280
It("create same CSV with owned API service multi namespace", func() {
12811281

1282-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1282+
defer cleaner.NotifyTestComplete(true)
12831283

1284-
c := newKubeClient(GinkgoT())
1285-
crc := newCRClient(GinkgoT())
1284+
c := newKubeClient()
1285+
crc := newCRClient()
12861286

12871287
// Create new namespace in a new operator group
12881288
secondNamespaceName := genName(testNamespace + "-")
@@ -1484,9 +1484,9 @@ var _ = Describe("CSV", func() {
14841484
})
14851485
It("orphaned API service clean up", func() {
14861486

1487-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1487+
defer cleaner.NotifyTestComplete(true)
14881488

1489-
c := newKubeClient(GinkgoT())
1489+
c := newKubeClient()
14901490

14911491
mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
14921492
version := "v1alpha1"
@@ -1550,10 +1550,10 @@ var _ = Describe("CSV", func() {
15501550
})
15511551
It("update same deployment name", func() {
15521552

1553-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1553+
defer cleaner.NotifyTestComplete(true)
15541554

1555-
c := newKubeClient(GinkgoT())
1556-
crc := newCRClient(GinkgoT())
1555+
c := newKubeClient()
1556+
crc := newCRClient()
15571557

15581558
// Create dependency first (CRD)
15591559
crdPlural := genName("ins")
@@ -1734,10 +1734,10 @@ var _ = Describe("CSV", func() {
17341734
})
17351735
It("update different deployment name", func() {
17361736

1737-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1737+
defer cleaner.NotifyTestComplete(true)
17381738

1739-
c := newKubeClient(GinkgoT())
1740-
crc := newCRClient(GinkgoT())
1739+
c := newKubeClient()
1740+
crc := newCRClient()
17411741

17421742
// Create dependency first (CRD)
17431743
crdPlural := genName("ins2")
@@ -1916,10 +1916,10 @@ var _ = Describe("CSV", func() {
19161916
})
19171917
It("update multiple intermediates", func() {
19181918

1919-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
1919+
defer cleaner.NotifyTestComplete(true)
19201920

1921-
c := newKubeClient(GinkgoT())
1922-
crc := newCRClient(GinkgoT())
1921+
c := newKubeClient()
1922+
crc := newCRClient()
19231923

19241924
// Create dependency first (CRD)
19251925
crdPlural := genName("ins3")
@@ -2104,10 +2104,10 @@ var _ = Describe("CSV", func() {
21042104
})
21052105
It("update in place", func() {
21062106

2107-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
2107+
defer cleaner.NotifyTestComplete(true)
21082108

2109-
c := newKubeClient(GinkgoT())
2110-
crc := newCRClient(GinkgoT())
2109+
c := newKubeClient()
2110+
crc := newCRClient()
21112111

21122112
// Create dependency first (CRD)
21132113
crdPlural := genName("ins")
@@ -2258,10 +2258,10 @@ var _ = Describe("CSV", func() {
22582258
})
22592259
It("update multiple version CRD", func() {
22602260

2261-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
2261+
defer cleaner.NotifyTestComplete(true)
22622262

2263-
c := newKubeClient(GinkgoT())
2264-
crc := newCRClient(GinkgoT())
2263+
c := newKubeClient()
2264+
crc := newCRClient()
22652265

22662266
// Create initial CRD which has 2 versions: v1alpha1 & v1alpha2
22672267
crdPlural := genName("ins4")
@@ -2539,10 +2539,10 @@ var _ = Describe("CSV", func() {
25392539
})
25402540
It("update modify deployment name", func() {
25412541

2542-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
2542+
defer cleaner.NotifyTestComplete(true)
25432543

2544-
c := newKubeClient(GinkgoT())
2545-
crc := newCRClient(GinkgoT())
2544+
c := newKubeClient()
2545+
crc := newCRClient()
25462546

25472547
// Create dependency first (CRD)
25482548
crdPlural := genName("ins2")
@@ -2691,10 +2691,10 @@ var _ = Describe("CSV", func() {
26912691
})
26922692
It("create requirements events", func() {
26932693
GinkgoT().Skip()
2694-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
2694+
defer cleaner.NotifyTestComplete(true)
26952695

2696-
c := newKubeClient(GinkgoT())
2697-
crc := newCRClient(GinkgoT())
2696+
c := newKubeClient()
2697+
crc := newCRClient()
26982698

26992699
sa := corev1.ServiceAccount{}
27002700
sa.SetName(genName("sa-"))
@@ -2909,10 +2909,10 @@ var _ = Describe("CSV", func() {
29092909
// TODO: test behavior when replaces field doesn't point to existing CSV
29102910
It("status invalid CSV", func() {
29112911

2912-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
2912+
defer cleaner.NotifyTestComplete(true)
29132913

2914-
c := newKubeClient(GinkgoT())
2915-
crc := newCRClient(GinkgoT())
2914+
c := newKubeClient()
2915+
crc := newCRClient()
29162916

29172917
// Create CRD
29182918
crdPlural := genName("ins")
@@ -3023,10 +3023,10 @@ var _ = Describe("CSV", func() {
30233023
})
30243024

30253025
It("api service resource migrated if adoptable", func() {
3026-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
3026+
defer cleaner.NotifyTestComplete(true)
30273027

3028-
c := newKubeClient(GinkgoT())
3029-
crc := newCRClient(GinkgoT())
3028+
c := newKubeClient()
3029+
crc := newCRClient()
30303030

30313031
depName := genName("hat-server")
30323032
mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
@@ -3107,10 +3107,10 @@ var _ = Describe("CSV", func() {
31073107
})
31083108

31093109
It("API service resource not migrated if not adoptable", func() {
3110-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
3110+
defer cleaner.NotifyTestComplete(true)
31113111

3112-
c := newKubeClient(GinkgoT())
3113-
crc := newCRClient(GinkgoT())
3112+
c := newKubeClient()
3113+
crc := newCRClient()
31143114

31153115
depName := genName("hat-server")
31163116
mockGroup := fmt.Sprintf("hats.%s.redhat.com", genName(""))
@@ -3194,10 +3194,10 @@ var _ = Describe("CSV", func() {
31943194
})
31953195

31963196
It("multiple API services on a single pod", func() {
3197-
defer cleaner.NotifyTestComplete(GinkgoT(), true)
3197+
defer cleaner.NotifyTestComplete(true)
31983198

3199-
c := newKubeClient(GinkgoT())
3200-
crc := newCRClient(GinkgoT())
3199+
c := newKubeClient()
3200+
crc := newCRClient()
32013201

32023202
// Create the deployment that both APIServices will be deployed to.
32033203
depName := genName("hat-server")
@@ -3622,7 +3622,7 @@ func waitForCSVToDelete(t GinkgoTInterface, c versioned.Interface, name string)
36223622
}
36233623

36243624
func deleteLegacyAPIResources(t GinkgoTInterface, desc v1alpha1.APIServiceDescription) {
3625-
c := newKubeClient(GinkgoT())
3625+
c := newKubeClient()
36263626

36273627
apiServiceName := fmt.Sprintf("%s.%s", desc.Version, desc.Group)
36283628

@@ -3646,7 +3646,7 @@ func deleteLegacyAPIResources(t GinkgoTInterface, desc v1alpha1.APIServiceDescri
36463646
}
36473647

36483648
func createLegacyAPIResources(t GinkgoTInterface, csv *v1alpha1.ClusterServiceVersion, desc v1alpha1.APIServiceDescription) {
3649-
c := newKubeClient(GinkgoT())
3649+
c := newKubeClient()
36503650

36513651
apiServiceName := fmt.Sprintf("%s.%s", desc.Version, desc.Group)
36523652

@@ -3733,7 +3733,7 @@ func createLegacyAPIResources(t GinkgoTInterface, csv *v1alpha1.ClusterServiceVe
37333733
}
37343734

37353735
func checkLegacyAPIResources(t GinkgoTInterface, desc v1alpha1.APIServiceDescription, expectedIsNotFound bool) {
3736-
c := newKubeClient(GinkgoT())
3736+
c := newKubeClient()
37373737
apiServiceName := fmt.Sprintf("%s.%s", desc.Version, desc.Group)
37383738

37393739
// Attempt to create the legacy service

0 commit comments

Comments
 (0)