From de600cf07ccc2b936f6cd7bea98d4aaaeb765b3c Mon Sep 17 00:00:00 2001 From: Rui Fu Date: Fri, 21 Jun 2024 18:21:59 +0800 Subject: [PATCH] timeout --- tests/operator/resources_test.go | 54 ++++++++++++++++---------------- tests/utils/spec.go | 4 +-- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/operator/resources_test.go b/tests/operator/resources_test.go index 46c84871..0407b9d6 100644 --- a/tests/operator/resources_test.go +++ b/tests/operator/resources_test.go @@ -74,8 +74,8 @@ var _ = Describe("Resources", func() { }, }, } - //ppackage *v1alphav1.PulsarPackage - //ppackageurl string = "source://public/default/test-source@latest" + ppackage *v1alphav1.PulsarPackage + ppackageurl string = "function://public/default/api-examples@v3.2.3.3" pfuncName string = "test-func" pfunc *v1alphav1.PulsarFunction psinkpackageurl string = "builtin://data-generator" @@ -102,8 +102,8 @@ var _ = Describe("Resources", func() { roles := []string{"ironman"} actions := []string{"produce", "consume", "functions"} ppermission = utils.MakePulsarPermission(namespaceName, ppermissionName, topicName, pconnName, v1alphav1.PulsarResourceTypeTopic, roles, actions, v1alphav1.CleanUpAfterDeletion) - //ppackage = utils.MakePulsarPackage(namespaceName, pfuncName, ppackageurl, pconnName, lifecyclePolicy) - pfunc = utils.MakePulsarFunction(namespaceName, pfuncName, "function://public/default/api-examples@latest", pconnName, lifecyclePolicy) + ppackage = utils.MakePulsarPackage(namespaceName, pfuncName, ppackageurl, pconnName, lifecyclePolicy) + pfunc = utils.MakePulsarFunction(namespaceName, pfuncName, ppackageurl, pconnName, lifecyclePolicy) psink = utils.MakePulsarSink(namespaceName, pfuncName, psinkpackageurl, pconnName, lifecyclePolicy) psource = utils.MakePulsarSource(namespaceName, pfuncName, psourcepackageurl, pconnName, lifecyclePolicy) }) @@ -292,33 +292,33 @@ var _ = Describe("Resources", func() { }) Context("PulsarFunction & PulsarPackage operation", func() { - //It("should create the pulsarpackage successfully", func() { - // err := k8sClient.Create(ctx, ppackage) - // Expect(err == nil || apierrors.IsAlreadyExists(err)).Should(BeTrue()) - //}) - // - //It("the package should be ready", func() { - // Eventually(func() bool { - // p := &v1alphav1.PulsarPackage{} - // tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} - // Expect(k8sClient.Get(ctx, tns, p)).Should(Succeed()) - // return v1alphav1.IsPulsarResourceReady(p) - // }, "20s", "100ms").Should(BeTrue()) - //}) + It("should create the pulsarpackage successfully", func() { + err := k8sClient.Create(ctx, ppackage) + Expect(err == nil || apierrors.IsAlreadyExists(err)).Should(BeTrue()) + }) + + It("the package should be ready", func() { + Eventually(func() bool { + p := &v1alphav1.PulsarPackage{} + tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} + Expect(k8sClient.Get(ctx, tns, p)).Should(Succeed()) + return v1alphav1.IsPulsarResourceReady(p) + }, "40s", "100ms").Should(BeTrue()) + }) It("should create the pulsarfunction successfully", func() { err := k8sClient.Create(ctx, pfunc) Expect(err == nil || apierrors.IsAlreadyExists(err)).Should(BeTrue()) }) - //It("the function should be ready", func() { - // Eventually(func() bool { - // f := &v1alphav1.PulsarFunction{} - // tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} - // Expect(k8sClient.Get(ctx, tns, f)).Should(Succeed()) - // return v1alphav1.IsPulsarResourceReady(f) - // }, "20s", "100ms").Should(BeTrue()) - //}) + It("the function should be ready", func() { + Eventually(func() bool { + f := &v1alphav1.PulsarFunction{} + tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} + Expect(k8sClient.Get(ctx, tns, f)).Should(Succeed()) + return v1alphav1.IsPulsarResourceReady(f) + }, "40s", "100ms").Should(BeTrue()) + }) }) Context("PulsarSink operation", func() { @@ -333,7 +333,7 @@ var _ = Describe("Resources", func() { tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} Expect(k8sClient.Get(ctx, tns, s)).Should(Succeed()) return v1alphav1.IsPulsarResourceReady(s) - }, "20s", "100ms").Should(BeTrue()) + }, "40s", "100ms").Should(BeTrue()) }) }) @@ -349,7 +349,7 @@ var _ = Describe("Resources", func() { tns := types.NamespacedName{Namespace: namespaceName, Name: pfuncName} Expect(k8sClient.Get(ctx, tns, s)).Should(Succeed()) return v1alphav1.IsPulsarResourceReady(s) - }, "20s", "100ms").Should(BeTrue()) + }, "40s", "100ms").Should(BeTrue()) }) }) diff --git a/tests/utils/spec.go b/tests/utils/spec.go index 4371919f..61196db6 100644 --- a/tests/utils/spec.go +++ b/tests/utils/spec.go @@ -132,8 +132,8 @@ func MakePulsarPackage(namespace, name, packageURL, connectionName string, polic Name: connectionName, }, PackageURL: packageURL, - FileURL: "https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=pulsar/pulsar-2.10.4/connectors/pulsar-io-file-2.10.4.nar", - Description: "pulsar-io-file-2.10.4", + FileURL: "https://github.com/freeznet/pulsar-functions-api-examples/raw/main/api-examples-2.10.4.3.jar", + Description: "api-examples.jar", LifecyclePolicy: policy, }, }