Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 9be77be

Browse files
author
aiordache
committed
Add compose logs test
Signed-off-by: aiordache <[email protected]>
1 parent 1e7ce90 commit 9be77be

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

kube/client/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@ func podToContainerSummary(pod corev1.Pod) compose.ContainerSummary {
9494
}
9595

9696
// GetLogs retrieves pod logs
97-
func (c *KubeClient) GetLogs(ctx context.Context, projectName string, consumer compose.LogConsumer, follow bool) error {
98-
pods, err := c.client.CoreV1().Pods(c.namespace).List(ctx, metav1.ListOptions{
97+
func (kc *KubeClient) GetLogs(ctx context.Context, projectName string, consumer compose.LogConsumer, follow bool) error {
98+
pods, err := kc.client.CoreV1().Pods(kc.namespace).List(ctx, metav1.ListOptions{
9999
LabelSelector: fmt.Sprintf("%s=%s", compose.ProjectTag, projectName),
100100
})
101101
if err != nil {
102102
return err
103103
}
104104
eg, ctx := errgroup.WithContext(ctx)
105105
for _, pod := range pods.Items {
106-
request := c.client.CoreV1().Pods(c.namespace).GetLogs(pod.Name, &corev1.PodLogOptions{Follow: follow})
106+
request := kc.client.CoreV1().Pods(kc.namespace).GetLogs(pod.Name, &corev1.PodLogOptions{Follow: follow})
107107
service := pod.Labels[compose.ServiceTag]
108108
w := utils.GetWriter(service, pod.Name, consumer)
109109

kube/e2e/compose_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,11 @@ func TestComposeUp(t *testing.T) {
108108
c.WaitForCmdResult(icmd.Command("docker", "--context", "default", "exec", "e2e-control-plane", "curl", endpoint), StdoutContains(`"word":`), 3*time.Minute, 3*time.Second)
109109
})
110110

111+
t.Run("compose logs web", func(t *testing.T) {
112+
res := c.RunDockerCmd("compose", "--project-name", projectName, "logs", "web")
113+
assert.Assert(t, strings.Contains(res.Stdout(), "Listening on port 80"), res.Stdout())
114+
})
115+
111116
t.Run("down", func(t *testing.T) {
112117
_ = c.RunDockerCmd("compose", "--project-name", projectName, "down")
113118
})

0 commit comments

Comments
 (0)