tests: fix terminal tests

Author: FabianKramm

cmd/root.go

@@ -77,6 +77,12 @@ func NewRootCmd(f factory.Factory) *cobra.Command {
 					log.Debugf("Applying extra flags from environment: %s", strings.Join(extraFlags, " "))
 				}
 
+				if globalFlags.Silent {
+					log.SetLevel(logrus.FatalLevel)
+				} else if globalFlags.Debug {
+					log.SetLevel(logrus.DebugLevel)
+				}
+
 				// call inactivity timeout
 				if globalFlags.InactivityTimeout > 0 {
 					m, err := idle.NewIdleMonitor()

cmd/run.go

@@ -91,8 +91,12 @@ devspace --dependency my-dependency run any-command --any-command-flag
 			_, err := flagspkg.ApplyExtraFlags(cobraCmd, osArgs, true)
 			if err != nil {
 				return err
-			} else if cmd.Silent {
+			}
+
+			if cmd.Silent {
 				log.SetLevel(logrus.FatalLevel)
+			} else if cmd.Debug {
+				log.SetLevel(logrus.DebugLevel)
 			}
 
 			args := os.Args[index:]

e2e/tests/terminal/terminal.go

@@ -3,15 +3,13 @@ package terminal
 import (
 	"bytes"
 	"context"
-	"fmt"
 	"github.com/loft-sh/devspace/cmd"
 	"github.com/loft-sh/devspace/cmd/flags"
 	"github.com/loft-sh/devspace/e2e/framework"
 	"github.com/loft-sh/devspace/e2e/kube"
 	"github.com/loft-sh/devspace/pkg/devspace/devpod"
 	"github.com/loft-sh/devspace/pkg/util/factory"
 	"github.com/onsi/ginkgo"
-	"io/ioutil"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/wait"
@@ -78,7 +76,6 @@ var _ = DevSpaceDescribe("terminal", func() {
 		// wait until we get the first hostnames
 		var podName string
 		err = wait.PollImmediate(time.Second, time.Minute*3, func() (done bool, err error) {
-			fmt.Println(buffer.String())
 			lines := strings.Split(buffer.String(), "\n")
 			if len(lines) <= 1 {
 				return false, nil
@@ -90,16 +87,7 @@ var _ = DevSpaceDescribe("terminal", func() {
 		framework.ExpectNoError(err)
 
 		// make sure the pod exists
-		pod, err := kubeClient.RawClient().CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})
-		framework.ExpectNoError(err)
-		framework.ExpectEqual(pod.Spec.Containers[0].Image, "ubuntu:18.04")
-
-		// now make a change to the config
-		fileContents, err := ioutil.ReadFile("devspace.yaml")
-		framework.ExpectNoError(err)
-		newString := strings.Replace(string(fileContents), "ubuntu:18.04", "alpine:3.14", -1)
-		newString = strings.Replace(newString, "container-0", "container-1", -1)
-		err = ioutil.WriteFile("devspace.yaml", []byte(newString), 0666)
+		err = kubeClient.RawClient().CoreV1().Pods(ns).Delete(context.TODO(), podName, metav1.DeleteOptions{})
 		framework.ExpectNoError(err)
 
 		// wait until pod is terminated
@@ -135,10 +123,8 @@ var _ = DevSpaceDescribe("terminal", func() {
 		framework.ExpectNoError(err)
 
 		// make sure the pod exists
-		pod, err = kubeClient.RawClient().CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})
+		_, err = kubeClient.RawClient().CoreV1().Pods(ns).Get(context.TODO(), podName, metav1.GetOptions{})
 		framework.ExpectNoError(err)
-		framework.ExpectEqual(pod.Spec.Containers[0].Image, "alpine:3.14")
-		framework.ExpectEqual(pod.Spec.Containers[0].Name, "container-1")
 
 		// make sure command terminates correctly
 		cancel()

examples/pipelines/devspace.yaml

@@ -3,7 +3,6 @@ name: pipelines
 
 vars:
   HELLO: test
-  DEVSPACE_LOG_TIMESTAMPS: true
 
 pipelines:
   dev:

pkg/devspace/kubectl/exec.go

@@ -111,12 +111,12 @@ func (client *client) execStreamWithTransport(ctx context.Context, options *Exec
 	}()
 
 	select {
-	case err = <-errChan:
-		return err
 	case <-ctx.Done():
 		upgradeRoundTripper.Close()
 		<-errChan
 		return nil
+	case err = <-errChan:
+		return err
 	}
 }
 

pkg/devspace/services/portforwarding/portforwarding.go

@@ -140,7 +140,7 @@ func startForwarding(ctx *devspacecontext.Context, name string, portMappings []*
 	}
 
 	readyChan := make(chan struct{})
-	errorChan := make(chan error)
+	errorChan := make(chan error, 1)
 	pf, err := ctx.KubeClient.NewPortForwarder(pod, ports, addresses, make(chan struct{}), readyChan, errorChan)
 	if err != nil {
 		return errors.Errorf("Error starting port forwarding: %v", err)

pkg/devspace/services/portforwarding/reverse_portforwarding.go

@@ -36,7 +36,7 @@ func startReversePortForwarding(ctx *devspacecontext.Context, name, arch string,
 	}
 
 	errorChan := make(chan error, 2)
-	closeChan := make(chan error)
+	closeChan := make(chan struct{})
 
 	stdinReader, stdinWriter := io.Pipe()
 	stdoutReader, stdoutWriter := io.Pipe()

pkg/devspace/services/sync/controller.go

@@ -84,7 +84,7 @@ func (c *controller) startWithWait(ctx *devspacecontext.Context, options *Option
 	var (
 		onInitUploadDone   chan struct{}
 		onInitDownloadDone chan struct{}
-		onError            = make(chan error)
+		onError            = make(chan error, 1)
 		onDone             = make(chan struct{})
 	)
 

pkg/devspace/services/terminal/terminal.go

@@ -181,6 +181,7 @@ fi`,
 
 	select {
 	case <-ctx.Context.Done():
+		<-errChan
 		return nil
 	case err = <-errChan:
 		if err != nil {

pkg/devspace/tunnel/client.go

@@ -186,7 +186,7 @@ func SendData(stream remote.Tunnel_InitTunnelClient, sessions <-chan *tunnel.Ses
 	}
 }
 
-func StartReverseForward(ctx context.Context, reader io.ReadCloser, writer io.WriteCloser, tunnels []*latest.PortMapping, stopChan chan error, namespace string, name string, log logpkg.Logger) error {
+func StartReverseForward(ctx context.Context, reader io.ReadCloser, writer io.WriteCloser, tunnels []*latest.PortMapping, stopChan chan struct{}, namespace string, name string, log logpkg.Logger) error {
 	scheme := "TCP"
 	closeStreams := make([]chan bool, len(tunnels))
 	defer func() {