Skip to content

Commit 8d5bee2

Browse files
committed
Remove redundant without-lb test
The creatable and deletable test is implied by the custom port test. There is no point running both.
1 parent 173edba commit 8d5bee2

File tree

1 file changed

+15
-24
lines changed

1 file changed

+15
-24
lines changed

test/e2e/suites/e2e/e2e_test.go

Lines changed: 15 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,21 @@ var _ = Describe("e2e tests", func() {
146146
configCluster.ControlPlaneMachineCount = pointer.Int64Ptr(1)
147147
configCluster.WorkerMachineCount = pointer.Int64Ptr(1)
148148
configCluster.Flavor = shared.FlavorWithoutLB
149-
_ = createCluster(ctx, configCluster)
149+
md := createCluster(ctx, configCluster)
150+
151+
workerMachines := framework.GetMachinesByMachineDeployments(ctx, framework.GetMachinesByMachineDeploymentsInput{
152+
Lister: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
153+
ClusterName: clusterName,
154+
Namespace: namespace.Name,
155+
MachineDeployment: *md[0],
156+
})
157+
controlPlaneMachines := framework.GetControlPlaneMachinesByCluster(ctx, framework.GetControlPlaneMachinesByClusterInput{
158+
Lister: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
159+
ClusterName: clusterName,
160+
Namespace: namespace.Name,
161+
})
162+
Expect(workerMachines).To(HaveLen(1))
163+
Expect(controlPlaneMachines).To(HaveLen(1))
150164

151165
shared.Byf("Creating MachineDeployment with custom port options")
152166
md3Name := clusterName + "-md-3"
@@ -179,29 +193,6 @@ var _ = Describe("e2e tests", func() {
179193
Expect(port.Description).To(Equal("primary"))
180194
Expect(port.Tags).To(ContainElement(testTag))
181195
})
182-
It("It should be creatable and deletable", func() {
183-
shared.Byf("Creating a cluster")
184-
clusterName := fmt.Sprintf("cluster-%s", namespace.Name)
185-
configCluster := defaultConfigCluster(clusterName, namespace.Name)
186-
configCluster.ControlPlaneMachineCount = pointer.Int64Ptr(1)
187-
configCluster.WorkerMachineCount = pointer.Int64Ptr(1)
188-
configCluster.Flavor = shared.FlavorWithoutLB
189-
md := createCluster(ctx, configCluster)
190-
191-
workerMachines := framework.GetMachinesByMachineDeployments(ctx, framework.GetMachinesByMachineDeploymentsInput{
192-
Lister: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
193-
ClusterName: clusterName,
194-
Namespace: namespace.Name,
195-
MachineDeployment: *md[0],
196-
})
197-
controlPlaneMachines := framework.GetControlPlaneMachinesByCluster(ctx, framework.GetControlPlaneMachinesByClusterInput{
198-
Lister: e2eCtx.Environment.BootstrapClusterProxy.GetClient(),
199-
ClusterName: clusterName,
200-
Namespace: namespace.Name,
201-
})
202-
Expect(len(workerMachines)).To(Equal(1))
203-
Expect(len(controlPlaneMachines)).To(Equal(1))
204-
})
205196
})
206197

207198
Describe("Workload cluster (multiple attached networks)", func() {

0 commit comments

Comments
 (0)