Skip to content

Commit dc20951

Browse files
AlinsRanAlinsRan
committed
fix test
1 parent 80fbc45 commit dc20951

7 files changed

Lines changed: 48 additions & 48 deletions

File tree

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ linux-build:
192192
build-image: docker-build
193193

194194
.PHONY: build-image-with-adc-dev
195-
build-image-with-adc-dev:
195+
build-image-with-adc-dev: build
196196
$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev .
197197

198198
.PHONY: build-push-image

‎test/e2e/apisix/e2e_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import (
1919
. "github.com/onsi/ginkgo/v2"
2020
. "github.com/onsi/gomega"
2121

22+
_ "github.com/apache/apisix-ingress-controller/test/e2e/crds"
2223
"github.com/apache/apisix-ingress-controller/test/e2e/framework"
2324
_ "github.com/apache/apisix-ingress-controller/test/e2e/gatewayapi"
2425
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"

‎test/e2e/crds/consumer.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
2424
)
2525

26-
var _ = Describe("Test Consumer", func() {
26+
var _ = FDescribe("Test Consumer", func() {
2727
s := scaffold.NewDefaultScaffold()
2828

2929
var defaultGatewayProxy = `
@@ -236,9 +236,11 @@ spec:
236236
s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
237237
})
238238

239-
It("Create/Update/Delete", func() {
239+
FIt("Create/Update/Delete", func() {
240240
s.ResourceApplied("Consumer", "consumer-sample", defaultCredential, 1)
241241

242+
time.Sleep(15 * time.Minute)
243+
242244
s.NewAPISIXClient().
243245
GET("/get").
244246
WithHeader("apikey", "sample-key").

‎test/e2e/gatewayapi/controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ metadata:
128128
Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the apisix-ingress-controller"), "checking Gateway condition message")
129129
}
130130

131-
Context("Create resource with first controller", func() {
131+
PContext("Create resource with first controller", func() {
132132
s1 := scaffold.NewScaffold(&scaffold.Options{
133133
Name: "gateway1",
134134
ControllerName: "apisix.apache.org/apisix-ingress-controller-1",
@@ -174,7 +174,7 @@ spec:
174174
assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], "apisix.apache.org/apisix-ingress-controller-1")
175175
})
176176
})
177-
Context("Create resource with second controller", func() {
177+
PContext("Create resource with second controller", func() {
178178
s2 := scaffold.NewScaffold(&scaffold.Options{
179179
Name: "gateway2",
180180
ControllerName: "apisix.apache.org/apisix-ingress-controller-2",

‎test/e2e/gatewayapi/gateway.go‎

Lines changed: 37 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func createSecret(s *scaffold.Scaffold, secretName string) {
3737
assert.Nil(GinkgoT(), err, "create secret error")
3838
}
3939

40-
var _ = FDescribe("Test Gateway", func() {
40+
var _ = Describe("Test Gateway", func() {
4141
s := scaffold.NewScaffold(&scaffold.Options{
4242
ControllerName: "apisix.apache.org/apisix-ingress-controller",
4343
})
@@ -148,7 +148,7 @@ spec:
148148
})
149149

150150
Context("Gateway SSL", func() {
151-
It("Check if SSL resource was created", func() {
151+
PIt("Check if SSL resource was created", func() {
152152
By("create GatewayProxy")
153153
gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
154154
err := s.CreateResourceFromString(gatewayProxy)
@@ -208,17 +208,16 @@ spec:
208208
assert.ElementsMatch(GinkgoT(), []string{host, "*.api6.com"}, tls[0].Snis)
209209
})
210210

211-
Context("Gateway SSL with and without hostname", func() {
212-
It("Check if SSL resource was created and updated", func() {
213-
By("create GatewayProxy")
214-
gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
215-
err := s.CreateResourceFromString(gatewayProxy)
216-
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
217-
time.Sleep(5 * time.Second)
218-
219-
secretName := _secretName
220-
createSecret(s, secretName)
221-
var defaultGatewayClass = `
211+
PIt("Gateway SSL with and without hostname", func() {
212+
By("create GatewayProxy")
213+
gatewayProxy := fmt.Sprintf(gatewayProxyYaml, s.Deployer.GetAdminEndpoint(), s.AdminKey())
214+
err := s.CreateResourceFromString(gatewayProxy)
215+
Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
216+
time.Sleep(5 * time.Second)
217+
218+
secretName := _secretName
219+
createSecret(s, secretName)
220+
var defaultGatewayClass = `
222221
apiVersion: gateway.networking.k8s.io/v1
223222
kind: GatewayClass
224223
metadata:
@@ -227,7 +226,7 @@ spec:
227226
controllerName: "apisix.apache.org/apisix-ingress-controller"
228227
`
229228

230-
var defaultGateway = fmt.Sprintf(`
229+
var defaultGateway = fmt.Sprintf(`
231230
apiVersion: gateway.networking.k8s.io/v1
232231
kind: Gateway
233232
metadata:
@@ -264,34 +263,33 @@ spec:
264263
kind: GatewayProxy
265264
name: apisix-proxy-config
266265
`, secretName, secretName)
267-
By("create GatewayClass")
268-
err = s.CreateResourceFromStringWithNamespace(defaultGatewayClass, "")
269-
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
270-
time.Sleep(5 * time.Second)
266+
By("create GatewayClass")
267+
err = s.CreateResourceFromStringWithNamespace(defaultGatewayClass, "")
268+
Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
269+
time.Sleep(5 * time.Second)
271270

272-
By("create Gateway")
273-
err = s.CreateResourceFromStringWithNamespace(defaultGateway, s.Namespace())
274-
Expect(err).NotTo(HaveOccurred(), "creating Gateway")
275-
time.Sleep(10 * time.Second)
271+
By("create Gateway")
272+
err = s.CreateResourceFromStringWithNamespace(defaultGateway, s.Namespace())
273+
Expect(err).NotTo(HaveOccurred(), "creating Gateway")
274+
time.Sleep(10 * time.Second)
275+
276+
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
277+
assert.Nil(GinkgoT(), err, "list tls error")
278+
assert.Len(GinkgoT(), tls, 1, "tls number not expect")
279+
assert.Equal(GinkgoT(), Cert, tls[0].Cert, "tls cert not expect")
280+
assert.Equal(GinkgoT(), tls[0].Labels["k8s/controller-name"], "apisix.apache.org/apisix-ingress-controller")
276281

282+
By("update secret")
283+
err = s.NewKubeTlsSecret(secretName, framework.TestCert, framework.TestKey)
284+
Expect(err).NotTo(HaveOccurred(), "update secret")
285+
Eventually(func() string {
277286
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
278-
assert.Nil(GinkgoT(), err, "list tls error")
279-
assert.Len(GinkgoT(), tls, 1, "tls number not expect")
280-
assert.Equal(GinkgoT(), Cert, tls[0].Cert, "tls cert not expect")
281-
assert.Equal(GinkgoT(), tls[0].Labels["k8s/controller-name"], "apisix.apache.org/apisix-ingress-controller")
282-
283-
By("update secret")
284-
err = s.NewKubeTlsSecret(secretName, framework.TestCert, framework.TestKey)
285-
Expect(err).NotTo(HaveOccurred(), "update secret")
286-
Eventually(func() string {
287-
tls, err := s.DefaultDataplaneResource().SSL().List(context.Background())
288-
Expect(err).NotTo(HaveOccurred(), "list ssl from dashboard")
289-
if len(tls) < 1 {
290-
return ""
291-
}
292-
return tls[0].Cert
293-
}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(framework.TestCert))
294-
})
287+
Expect(err).NotTo(HaveOccurred(), "list ssl from dashboard")
288+
if len(tls) < 1 {
289+
return ""
290+
}
291+
return tls[0].Cert
292+
}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(framework.TestCert))
295293
})
296294
})
297295

‎test/e2e/gatewayapi/gatewayclass.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
2222
)
2323

24-
var _ = FDescribe("Test GatewayClass", func() {
24+
var _ = Describe("Test GatewayClass", func() {
2525
s := scaffold.NewScaffold(&scaffold.Options{
2626
ControllerName: "apisix.apache.org/apisix-ingress-controller",
2727
})

‎test/e2e/gatewayapi/httproute.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ spec:
324324
Expect(gcyaml).To(ContainSubstring("message: the gatewayclass has been accepted by the apisix-ingress-controller"), "checking additional GatewayClass condition message")
325325

326326
additionalGatewayProxy := fmt.Sprintf(additionalGatewayProxyYaml, s.Deployer.GetAdminEndpoint(resources.DataplaneService), resources.AdminAPIKey)
327-
err = s.CreateResourceFromStringWithNamespace(additionalGatewayProxy, additionalNamespace)
327+
err = s.CreateResourceFromStringWithNamespace(additionalGatewayProxy, resources.DataplaneService.Namespace)
328328
Expect(err).NotTo(HaveOccurred(), "creating additional GatewayProxy")
329329

330330
By("Create additional Gateway")
@@ -1619,7 +1619,6 @@ spec:
16191619

16201620
Context("HTTPRoute with GatewayProxy Update", func() {
16211621
var additionalGatewayGroupID string
1622-
var additionalGatewaySvc *corev1.Service
16231622

16241623
var exactRouteByGet = `
16251624
apiVersion: gateway.networking.k8s.io/v1
@@ -1673,7 +1672,7 @@ spec:
16731672

16741673
By("create additional gateway group to get new admin key")
16751674
var err error
1676-
additionalGatewayGroupID, additionalGatewaySvc, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
1675+
additionalGatewayGroupID, _, err = s.Deployer.CreateAdditionalGateway("gateway-proxy-update")
16771676
Expect(err).NotTo(HaveOccurred(), "creating additional gateway group")
16781677

16791678
resources, exists := s.GetAdditionalGateway(additionalGatewayGroupID)

0 commit comments

Comments
 (0)