You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/07/26 08:52:20 UTC
[camel-k] branch main updated (b035e30 -> b415f92)
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git.
from b035e30 Updated CHANGELOG.md
new 4ad0083 Auxiliary function for async getting of cobra command output as a string was added
new 6c48100 Kamel CLI log test was added
new b415f92 Kamel CLI bind test was added
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../{integration_fail_test.go => cli/bind_test.go} | 24 ++++++++++++++--------
.../{integration_fail_test.go => cli/log_test.go} | 23 +++++++++++++--------
e2e/support/test_support.go | 12 +++++++++++
3 files changed, 42 insertions(+), 17 deletions(-)
copy e2e/common/{integration_fail_test.go => cli/bind_test.go} (58%)
copy e2e/common/{integration_fail_test.go => cli/log_test.go} (64%)
[camel-k] 03/03: Kamel CLI bind test was added
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit b415f92c1694c540cbebeca9080108060ba0293e
Author: Vladislav Sokolovskii <vs...@redhat.com>
AuthorDate: Mon Jun 28 21:51:17 2021 +0300
Kamel CLI bind test was added
---
e2e/common/cli/bind_test.go | 53 +++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/e2e/common/cli/bind_test.go b/e2e/common/cli/bind_test.go
new file mode 100644
index 0000000..cdab115
--- /dev/null
+++ b/e2e/common/cli/bind_test.go
@@ -0,0 +1,53 @@
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package common
+
+import (
+ v1 "k8s.io/api/core/v1"
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ . "github.com/apache/camel-k/e2e/support"
+)
+
+func TestKamelCLIBind(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+ Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
+ Expect(CreateTimerKamelet(ns, "test-timer-source")()).To(Succeed())
+
+ t.Run("bind timer to log", func(t *testing.T) {
+ Expect(Kamel("bind", "test-timer-source", "log:info", "-p", "source.message=helloTest", "-n", ns).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "test-timer-source-to-log"), TestTimeoutLong).Should(Equal(v1.PodRunning))
+
+ Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: helloTest"))
+ Expect(Kamel("bind", "test-timer-source", "log:info", "-p", "source.message=newText", "-n", ns).Execute()).To(Succeed())
+ Eventually(IntegrationLogs(ns, "test-timer-source-to-log")).Should(ContainSubstring("Body: newText"))
+
+ Expect(Kamel("delete", "--all", "-n", ns).Execute()).To(Succeed())
+ })
+
+ t.Run("unsuccessful binding, no property", func(t *testing.T) {
+ Expect(Kamel("bind", "timer-source", "log:info", "-n", ns).Execute()).NotTo(Succeed())
+ })
+ })
+}
[camel-k] 02/03: Kamel CLI log test was added
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6c48100661b69fa077e2d6acc4aff1c77554330b
Author: Vladislav Sokolovskii <vs...@redhat.com>
AuthorDate: Fri Jun 25 18:13:03 2021 +0300
Kamel CLI log test was added
---
e2e/common/cli/log_test.go | 50 ++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/e2e/common/cli/log_test.go b/e2e/common/cli/log_test.go
new file mode 100644
index 0000000..922b832
--- /dev/null
+++ b/e2e/common/cli/log_test.go
@@ -0,0 +1,50 @@
+// +build integration
+
+// To enable compilation of this file in Goland, go to "Settings -> Go -> Vendoring & Build Tags -> Custom Tags" and add "integration"
+
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package common
+
+import (
+ v1 "k8s.io/api/core/v1"
+ "strings"
+ "testing"
+
+ . "github.com/onsi/gomega"
+
+ . "github.com/apache/camel-k/e2e/support"
+)
+
+func TestKamelCLILog(t *testing.T) {
+ WithNewTestNamespace(t, func(ns string) {
+ Expect(Kamel("install", "-n", ns).Execute()).To(Succeed())
+
+ t.Run("check integration log", func(t *testing.T) {
+ Expect(Kamel("run", "../files/yaml.yaml", "-n", ns).Execute()).To(Succeed())
+ Eventually(IntegrationPodPhase(ns, "yaml"), TestTimeoutMedium).Should(Equal(v1.PodRunning))
+ //first line of the integration logs
+ logs := strings.Split(IntegrationLogs(ns, "yaml")(), "\n")[0]
+ podName := IntegrationPod(ns, "yaml")().Name
+
+ logsCLI := GetOutputStringAsync(Kamel("log", "yaml", "-n", ns))
+ Eventually(logsCLI).Should(ContainSubstring("Monitoring pod " + podName))
+ Eventually(logsCLI).Should(ContainSubstring(logs))
+ })
+ })
+}
[camel-k] 01/03: Auxiliary function for async getting of cobra
command output as a string was added
Posted by as...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 4ad0083bf62766c117577e32d0c4be3c0c67a096
Author: Vladislav Sokolovskii <vs...@redhat.com>
AuthorDate: Fri Jun 25 18:05:38 2021 +0300
Auxiliary function for async getting of cobra command output as a string was added
---
e2e/support/test_support.go | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/e2e/support/test_support.go b/e2e/support/test_support.go
index 01a4536..424e492 100644
--- a/e2e/support/test_support.go
+++ b/e2e/support/test_support.go
@@ -1372,3 +1372,15 @@ func GetOutputString(command *cobra.Command) string {
return buf.String()
}
+
+func GetOutputStringAsync(cmd *cobra.Command) func() string {
+ var buffer bytes.Buffer
+ stdout := bufio.NewWriter(&buffer)
+
+ cmd.SetOut(stdout)
+ go cmd.Execute()
+
+ return func() string {
+ return buffer.String()
+ }
+}