Skip to content

Commit 3cd0ff9

Browse files
JorresJorres
committed
replace medium size tests with 3 node setup
1 parent d4bdea6 commit 3cd0ff9

File tree

8 files changed

+31
-30
lines changed

8 files changed

+31
-30
lines changed

‎internal/controllers/database/controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var _ = Describe("Database controller medium tests", func() {
6262
},
6363
}
6464
Expect(k8sClient.Create(ctx, &namespace)).Should(Succeed())
65-
storageSample = *testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
65+
storageSample = *testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
6666
Expect(k8sClient.Create(ctx, &storageSample)).Should(Succeed())
6767

6868
By("checking that Storage created on local cluster...")

‎internal/controllers/databasenodeset/controller_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ var _ = Describe("DatabaseNodeSet controller medium tests", func() {
7171
}
7272
Expect(k8sClient.Create(ctx, &namespace)).Should(Succeed())
7373

74-
storageSample = *testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
74+
storageSample = *testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
7575
Expect(k8sClient.Create(ctx, &storageSample)).Should(Succeed())
7676

7777
By("checking that Storage created on local cluster...")
@@ -103,7 +103,7 @@ var _ = Describe("DatabaseNodeSet controller medium tests", func() {
103103
databaseSample.Spec.NodeSets = append(databaseSample.Spec.NodeSets, v1alpha1.DatabaseNodeSetSpecInline{
104104
Name: testNodeSetName,
105105
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
106-
Nodes: 4,
106+
Nodes: 1,
107107
},
108108
})
109109

@@ -160,7 +160,7 @@ var _ = Describe("DatabaseNodeSet controller medium tests", func() {
160160
testNodeSetLabel: "true",
161161
},
162162
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
163-
Nodes: 2,
163+
Nodes: 1,
164164
},
165165
})
166166

@@ -170,7 +170,7 @@ var _ = Describe("DatabaseNodeSet controller medium tests", func() {
170170
v1alpha1.AnnotationDataCenter: "envtest",
171171
},
172172
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
173-
Nodes: 2,
173+
Nodes: 1,
174174
},
175175
})
176176

‎internal/controllers/monitoring/monitoring_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func createMockDBAndSvc() {
119119
func createMockStorageAndSvc() {
120120
GinkgoHelper()
121121

122-
stor := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
122+
stor := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
123123
Expect(k8sClient.Create(ctx, stor)).Should(Succeed())
124124

125125
stor.Status.State = StorageReady

‎internal/controllers/remotedatabasenodeset/controller_test.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -206,12 +206,12 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
206206
var databaseSample *v1alpha1.Database
207207

208208
BeforeEach(func() {
209-
storageSample = testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
209+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
210210
databaseSample = testobjects.DefaultDatabase()
211211
databaseSample.Spec.NodeSets = append(databaseSample.Spec.NodeSets, v1alpha1.DatabaseNodeSetSpecInline{
212212
Name: testNodeSetName + "-local",
213213
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
214-
Nodes: 4,
214+
Nodes: 1,
215215
},
216216
})
217217
databaseSample.Spec.NodeSets = append(databaseSample.Spec.NodeSets, v1alpha1.DatabaseNodeSetSpecInline{
@@ -220,7 +220,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
220220
Cluster: testRemoteCluster,
221221
},
222222
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
223-
Nodes: 4,
223+
Nodes: 1,
224224
},
225225
})
226226
databaseSample.Spec.NodeSets = append(databaseSample.Spec.NodeSets, v1alpha1.DatabaseNodeSetSpecInline{
@@ -229,7 +229,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
229229
Cluster: testRemoteCluster,
230230
},
231231
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
232-
Nodes: 4,
232+
Nodes: 1,
233233
},
234234
})
235235

@@ -445,7 +445,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
445445
Cluster: testRemoteCluster,
446446
},
447447
StorageNodeSpec: v1alpha1.StorageNodeSpec{
448-
Nodes: 4,
448+
Nodes: 1,
449449
},
450450
})
451451

@@ -570,7 +570,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
570570
{
571571
Name: testNodeSetName + "-local",
572572
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
573-
Nodes: 4,
573+
Nodes: 2,
574574
},
575575
},
576576
{
@@ -579,7 +579,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
579579
Cluster: testRemoteCluster,
580580
},
581581
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
582-
Nodes: 4,
582+
Nodes: 1,
583583
},
584584
},
585585
}
@@ -823,7 +823,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
823823
{
824824
Name: testNodeSetName + "-local",
825825
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
826-
Nodes: 4,
826+
Nodes: 2,
827827
},
828828
},
829829
{
@@ -832,7 +832,7 @@ var _ = Describe("RemoteDatabaseNodeSet controller tests", func() {
832832
Cluster: testRemoteCluster,
833833
},
834834
DatabaseNodeSpec: v1alpha1.DatabaseNodeSpec{
835-
Nodes: 4,
835+
Nodes: 1,
836836
},
837837
},
838838
}

‎internal/controllers/remotestoragenodeset/controller_test.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
179179
var storageSample *v1alpha1.Storage
180180

181181
BeforeEach(func() {
182-
storageSample = testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
182+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
183183
storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
184184
Name: testNodeSetName + "-local",
185185
StorageNodeSpec: v1alpha1.StorageNodeSpec{
186-
Nodes: 4,
186+
Nodes: 1,
187187
},
188188
})
189189
storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
@@ -192,7 +192,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
192192
Cluster: testRemoteCluster,
193193
},
194194
StorageNodeSpec: v1alpha1.StorageNodeSpec{
195-
Nodes: 2,
195+
Nodes: 1,
196196
},
197197
})
198198
storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
@@ -201,7 +201,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
201201
Cluster: testRemoteCluster,
202202
},
203203
StorageNodeSpec: v1alpha1.StorageNodeSpec{
204-
Nodes: 2,
204+
Nodes: 1,
205205
},
206206
})
207207

@@ -569,7 +569,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
569569
{
570570
Name: testNodeSetName + "-local",
571571
StorageNodeSpec: v1alpha1.StorageNodeSpec{
572-
Nodes: 6,
572+
Nodes: 2,
573573
},
574574
},
575575
{
@@ -578,7 +578,7 @@ var _ = Describe("RemoteStorageNodeSet controller tests", func() {
578578
Cluster: testRemoteCluster,
579579
},
580580
StorageNodeSpec: v1alpha1.StorageNodeSpec{
581-
Nodes: 2,
581+
Nodes: 1,
582582
},
583583
},
584584
}

‎internal/controllers/storage/controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ var _ = Describe("Storage controller medium tests", func() {
6262
})
6363

6464
It("Checking field propagation to objects", func() {
65-
storageSample := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
65+
storageSample := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
6666

6767
tmpFilesDir := "/tmp/mounted_volume"
6868
testVolumeName := "sample-volume"

‎internal/controllers/storagenodeset/controller_test.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,16 @@ var _ = Describe("StorageNodeSet controller medium tests", func() {
6262
})
6363

6464
It("Check controller operation through nodeSetSpec inline spec in Storage object", func() {
65-
storageSample := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-block-4-2-config.yaml"))
65+
storageSample := testobjects.DefaultStorage(filepath.Join("..", "..", "..", "e2e", "tests", "data", "storage-mirror-3-dc-config.yaml"))
6666

6767
// Test create inline nodeSetSpec in Storage object
6868
testNodeSetName := "nodeset"
69-
for idx := 1; idx <= 4; idx++ {
69+
storageNodeSetAmount := 3
70+
for idx := 1; idx <= storageNodeSetAmount; idx++ {
7071
storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
7172
Name: testNodeSetName + "-" + strconv.Itoa(idx),
7273
StorageNodeSpec: v1alpha1.StorageNodeSpec{
73-
Nodes: 2,
74+
Nodes: 1,
7475
},
7576
})
7677
}
@@ -84,14 +85,14 @@ var _ = Describe("StorageNodeSet controller medium tests", func() {
8485
))).Should(Succeed())
8586
foundStorageNodeSet := make(map[int]bool)
8687
for _, storageNodeSet := range storageNodeSets.Items {
87-
for idxNodeSet := 1; idxNodeSet <= 4; idxNodeSet++ {
88+
for idxNodeSet := 1; idxNodeSet <= storageNodeSetAmount; idxNodeSet++ {
8889
if storageNodeSet.Name == testobjects.StorageName+"-"+testNodeSetName+"-"+strconv.Itoa(idxNodeSet) {
8990
foundStorageNodeSet[idxNodeSet] = true
9091
break
9192
}
9293
}
9394
}
94-
for idxNodeSet := 1; idxNodeSet <= 4; idxNodeSet++ {
95+
for idxNodeSet := 1; idxNodeSet <= storageNodeSetAmount; idxNodeSet++ {
9596
if !foundStorageNodeSet[idxNodeSet] {
9697
return false
9798
}
@@ -107,14 +108,14 @@ var _ = Describe("StorageNodeSet controller medium tests", func() {
107108
))).Should(Succeed())
108109
foundStatefulSet := make(map[int]bool)
109110
for _, statefulSet := range storageStatefulSets.Items {
110-
for idxNodeSet := 1; idxNodeSet <= 4; idxNodeSet++ {
111+
for idxNodeSet := 1; idxNodeSet <= storageNodeSetAmount; idxNodeSet++ {
111112
if statefulSet.Name == testobjects.StorageName+"-"+testNodeSetName+"-"+strconv.Itoa(idxNodeSet) {
112113
foundStatefulSet[idxNodeSet] = true
113114
break
114115
}
115116
}
116117
}
117-
for idxNodeSet := 1; idxNodeSet <= 4; idxNodeSet++ {
118+
for idxNodeSet := 1; idxNodeSet <= storageNodeSetAmount; idxNodeSet++ {
118119
if !foundStatefulSet[idxNodeSet] {
119120
return false
120121
}

‎internal/test/k8s_helpers.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
const (
24-
Timeout = 10 * time.Second
24+
Timeout = 30 * time.Second
2525
Interval = 1 * time.Second
2626
)
2727

0 commit comments

Comments
 (0)