Skip to content

Commit 0980b6c

Browse files
fix the order in which resources are cleaned up
1 parent 9d0d9b6 commit 0980b6c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

test/e2e/dedicated_loadbalancer_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ var _ = ginkgo.Describe("dedicated ELB service test with the specified ID", func
127127
if vpcOpts.SubnetID == "" {
128128
return
129129
}
130-
framework.RemoveDeployment(kubeClient, deployment.Namespace, deployment.Name)
131130
if service1 != nil {
132131
framework.RemoveService(kubeClient, service1.Namespace, service1.Name)
133132
framework.WaitServiceDisappearOnCluster(kubeClient, service1.Namespace, service1.Name)
@@ -137,6 +136,8 @@ var _ = ginkgo.Describe("dedicated ELB service test with the specified ID", func
137136
framework.WaitServiceDisappearOnCluster(kubeClient, service2.Namespace, service2.Name)
138137
}
139138

139+
framework.RemoveDeployment(kubeClient, deployment.Namespace, deployment.Name)
140+
140141
sharedElbClient := wrapper.SharedLoadBalanceClient{AuthOpts: authOpts}
141142
_, err := sharedElbClient.GetInstance(*elbID)
142143
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())

test/e2e/shared_loadbalancer_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,6 @@ var _ = ginkgo.Describe("Use an existing shared load balancer (TCP) service test
208208
if vpcOpts.SubnetID == "" {
209209
return
210210
}
211-
framework.RemoveDeployment(kubeClient, deployment.Namespace, deployment.Name)
212211
if service1 != nil {
213212
framework.RemoveService(kubeClient, service1.Namespace, service1.Name)
214213
framework.WaitServiceDisappearOnCluster(kubeClient, service1.Namespace, service1.Name)
@@ -218,6 +217,8 @@ var _ = ginkgo.Describe("Use an existing shared load balancer (TCP) service test
218217
framework.WaitServiceDisappearOnCluster(kubeClient, service2.Namespace, service2.Name)
219218
}
220219

220+
framework.RemoveDeployment(kubeClient, deployment.Namespace, deployment.Name)
221+
221222
sharedElbClient := wrapper.SharedLoadBalanceClient{AuthOpts: authOpts}
222223
_, err := sharedElbClient.GetInstance(*elbID)
223224
gomega.Expect(err).ShouldNot(gomega.HaveOccurred())

0 commit comments

Comments
 (0)