You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/03/10 17:11:44 UTC
[camel-k] 09/09: Fix e2e tests for openapi (take 2)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 84d51d6eea8ea5b7a8c57fc867a7803c249a1a46
Author: lburgazzoli <lb...@gmail.com>
AuthorDate: Tue Mar 10 11:11:07 2020 +0100
Fix e2e tests for openapi (take 2)
---
e2e/openapi_test.go | 2 --
e2e/test_support.go | 13 +++++++------
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/e2e/openapi_test.go b/e2e/openapi_test.go
index 0abdf0d..e4fb0c0 100644
--- a/e2e/openapi_test.go
+++ b/e2e/openapi_test.go
@@ -41,8 +41,6 @@ func TestOpenAPIService(t *testing.T) {
"files/petstore.groovy",
).Execute()).Should(BeNil())
- Eventually(integrationPodPhase(ns, "petstore"), testTimeoutLong).
- Should(Equal(corev1.PodRunning))
Eventually(knativeService(ns, "petstore"), testTimeoutLong).
Should(Not(BeNil()))
diff --git a/e2e/test_support.go b/e2e/test_support.go
index 5dc29e5..4394a65 100644
--- a/e2e/test_support.go
+++ b/e2e/test_support.go
@@ -82,6 +82,7 @@ func init() {
client.FastMapperAllowedAPIGroups["project.openshift.io"] = true
client.FastMapperAllowedAPIGroups["eventing.knative.dev"] = true
client.FastMapperAllowedAPIGroups["messaging.knative.dev"] = true
+ client.FastMapperAllowedAPIGroups["serving.knative.dev"] = true
var err error
testContext = context.TODO()
@@ -472,7 +473,7 @@ func configmap(ns string, name string) func() *corev1.ConfigMap {
func knativeService(ns string, name string) func() *servingv1.Service {
return func() *servingv1.Service {
- cm := servingv1.Service{
+ answer := servingv1.Service{
TypeMeta: metav1.TypeMeta{
Kind: "Service",
APIVersion: servingv1.SchemeGroupVersion.String(),
@@ -486,19 +487,19 @@ func knativeService(ns string, name string) func() *servingv1.Service {
Namespace: ns,
Name: name,
}
- if err := testClient.Get(testContext, key, &cm); err != nil && k8serrors.IsNotFound(err) {
+ if err := testClient.Get(testContext, key, &answer); err != nil && k8serrors.IsNotFound(err) {
return nil
} else if err != nil {
log.Errorf(err, "Error while retrieving knative service %s", name)
return nil
}
- return &cm
+ return &answer
}
}
func deployment(ns string, name string) func() *appsv1.Deployment {
return func() *appsv1.Deployment {
- cm := appsv1.Deployment{
+ answer := appsv1.Deployment{
TypeMeta: metav1.TypeMeta{
Kind: "Deployment",
APIVersion: appsv1.SchemeGroupVersion.String(),
@@ -512,13 +513,13 @@ func deployment(ns string, name string) func() *appsv1.Deployment {
Namespace: ns,
Name: name,
}
- if err := testClient.Get(testContext, key, &cm); err != nil && k8serrors.IsNotFound(err) {
+ if err := testClient.Get(testContext, key, &answer); err != nil && k8serrors.IsNotFound(err) {
return nil
} else if err != nil {
log.Errorf(err, "Error while retrieving deployment %s", name)
return nil
}
- return &cm
+ return &answer
}
}