Some fixes for e2e tests

- honor configured `initialSync` unless `--download-on-initial-sync` is explicitly set
- avoid `devspacehelper` replacement races by installing via a temp path and atomic move
- drain initial watcher noise for `initialSync: disabled`
- relax portforward nginx assertions to match current upstream content
- harden terminal restart parsing against concurrent output corruption
- harden build e2e image lookup for untagged Docker images, including `.dockerignore` cases
- refresh embedded asset metadata

Author: zerbitx

assets/assets.go

@@ -47,10 +47,11 @@ type SyncCmd struct {
 
 	InitialSync string
 
-	NoWatch               bool
-	DownloadOnInitialSync bool
-	DownloadOnly          bool
-	UploadOnly            bool
+	NoWatch                      bool
+	DownloadOnInitialSync        bool
+	downloadOnInitialSyncChanged bool
+	DownloadOnly                 bool
+	UploadOnly                   bool
 
 	// used for testing to allow interruption
 	Ctx context.Context
@@ -79,6 +80,7 @@ devspace sync --path=.:/app --pod=my-pod --container=my-container
 			// Print upgrade message if new version available
 			upgrade.PrintUpgradeMessage(f.GetLog())
 			plugin.SetPluginCommand(cobraCmd, args)
+			cmd.downloadOnInitialSyncChanged = cobraCmd.Flags().Changed("download-on-initial-sync")
 			return cmd.Run(f)
 		},
 	}
@@ -329,10 +331,12 @@ func (cmd *SyncCmd) applyFlagsToSyncConfig(syncConfig *latest.SyncConfig, option
 		options = options.WithNamespace(cmd.Namespace)
 	}
 
-	if cmd.DownloadOnInitialSync {
-		syncConfig.InitialSync = latest.InitialSyncStrategyPreferLocal
-	} else {
-		syncConfig.InitialSync = latest.InitialSyncStrategyMirrorLocal
+	if cmd.downloadOnInitialSyncChanged || syncConfig.InitialSync == "" {
+		if cmd.DownloadOnInitialSync {
+			syncConfig.InitialSync = latest.InitialSyncStrategyPreferLocal
+		} else {
+			syncConfig.InitialSync = latest.InitialSyncStrategyMirrorLocal
+		}
 	}
 
 	if cmd.InitialSync != "" {

cmd/sync.go

@@ -92,13 +92,13 @@ func ExpectRemoteFileContents(imageSelector string, namespace string, filePath s
 	ExpectNoErrorWithOffset(1, err)
 }
 
-func ExpectLocalCurlContents(urlString string, contents string) {
+func ExpectLocalCurlContains(urlString string, contents string) {
 	client := resty.New()
 	err := wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*2, true, func(_ context.Context) (done bool, err error) {
 		resp, _ := client.R().
 			EnableTrace().
 			Get(urlString)
-		return strings.TrimSpace(string(resp.Body())) == strings.TrimSpace(contents), nil
+		return strings.Contains(strings.TrimSpace(string(resp.Body())), strings.TrimSpace(contents)), nil
 	})
 	ExpectNoErrorWithOffset(1, err)
 }
@@ -118,15 +118,15 @@ func ExpectContainerNameAndImageEqual(namespace, deploymentName, containerImage,
 	ExpectNoErrorWithOffset(1, err)
 }
 
-func ExpectRemoteCurlContents(imageSelector string, namespace string, urlString string, contents string) {
+func ExpectRemoteCurlContains(imageSelector string, namespace string, urlString string, contents string) {
 	kubeClient, err := kube.NewKubeHelper()
 	ExpectNoErrorWithOffset(1, err)
 	err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*2, true, func(_ context.Context) (done bool, err error) {
 		out, err := kubeClient.ExecByImageSelector(imageSelector, namespace, []string{"curl", urlString})
 		if err != nil {
 			return false, nil
 		}
-		return strings.TrimSpace(out) == strings.TrimSpace(contents), nil
+		return strings.Contains(strings.TrimSpace(out), strings.TrimSpace(contents)), nil
 	})
 	ExpectNoErrorWithOffset(1, err)
 }

e2e/framework/helper.go

@@ -246,14 +246,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 
-		for _, image := range imageList {
-			if len(image.RepoTags) > 0 && image.RepoTags[0] == "my-docker-username/helloworld-buildkit:latest" {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, "my-docker-username/helloworld-buildkit:latest")
 		framework.ExpectNoError(err)
 
 		var stdout, stderr bytes.Buffer
@@ -290,14 +283,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 
-		for _, image := range imageList {
-			if len(image.RepoTags) > 0 && image.RepoTags[0] == "my-docker-username/helloworld-buildkit:latest" {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, "my-docker-username/helloworld-buildkit:latest")
 		framework.ExpectNoError(err)
 	})
 
@@ -342,14 +328,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 
-		for _, image := range imageList {
-			if len(image.RepoTags) > 0 && image.RepoTags[0] == "my-docker-username/helloworld-custom-build:latest" {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, "my-docker-username/helloworld-custom-build:latest")
 		framework.ExpectNoError(err)
 	})
 
@@ -377,14 +356,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 		imageName := "my-docker-username/helloworld-dockerignore:latest"
-		for _, image := range imageList {
-			if image.RepoTags[0] == imageName {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, imageName)
 		framework.ExpectNoError(err)
 
 		resp, err := dockerClient.ContainerCreate(ctx, &container.Config{
@@ -442,14 +414,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 		imageName := "my-docker-username/helloworld-dockerignore-rel-path:latest"
-		for _, image := range imageList {
-			if image.RepoTags[0] == imageName {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, imageName)
 		framework.ExpectNoError(err)
 
 		resp, err := dockerClient.ContainerCreate(ctx, &container.Config{
@@ -507,14 +472,7 @@ var _ = DevSpaceDescribe("build", func() {
 		imageList, err := dockerClient.ImageList(ctx, image.ListOptions{})
 		framework.ExpectNoError(err)
 		imageName := "my-docker-username/helloworld-dockerignore-context:latest"
-		for _, image := range imageList {
-			if image.RepoTags[0] == imageName {
-				err = nil
-				break
-			} else {
-				err = errors.New("image not found")
-			}
-		}
+		err = ensureImagePresent(imageList, imageName)
 		framework.ExpectNoError(err)
 
 		resp, err := dockerClient.ContainerCreate(ctx, &container.Config{
@@ -556,6 +514,18 @@ func stdoutContains(stdout, content string) error {
 	return fmt.Errorf("%s found in output", content)
 }
 
+func ensureImagePresent(imageList []image.Summary, imageName string) error {
+	for _, image := range imageList {
+		for _, repoTag := range image.RepoTags {
+			if repoTag == imageName {
+				return nil
+			}
+		}
+	}
+
+	return errors.New("image not found")
+}
+
 func stderrContains(stderr, content string) error {
 	if strings.Contains(stderr, content) {
 		return nil

e2e/tests/build/build.go

@@ -3,14 +3,15 @@ package portforward
 import (
 	"context"
 	"fmt"
+	"net/http"
+	"os"
+	
 	"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/util/factory"
 	"github.com/onsi/ginkgo/v2"
-	"net/http"
-	"os"
 )
 
 var _ = DevSpaceDescribe("portforward", func() {
@@ -69,13 +70,13 @@ var _ = DevSpaceDescribe("portforward", func() {
 			done <- devCmd.RunDefault(f)
 		}()
 
-		nginxResp := "<!DOCTYPE html>\n<html>\n<head>\n<title>Welcome to nginx!</title>\n<style>\nhtml { color-scheme: light dark; }\nbody { width: 35em; margin: 0 auto;\nfont-family: Tahoma, Verdana, Arial, sans-serif; }\n</style>\n</head>\n<body>\n<h1>Welcome to nginx!</h1>\n<p>If you see this page, the nginx web server is successfully installed and\nworking. Further configuration is required.</p>\n\n<p>For online documentation and support please refer to\n<a href=\"http://nginx.org/\">nginx.org</a>.<br/>\nCommercial support is available at\n<a href=\"http://nginx.com/\">nginx.com</a>.</p>\n\n<p><em>Thank you for using nginx.</em></p>\n</body>\n</html>"
-		framework.ExpectRemoteCurlContents("nginx", ns, "localhost", nginxResp)
-		framework.ExpectLocalCurlContents("http://localhost:3000", nginxResp)
+		nginxResp := "Welcome to nginx!"
+		framework.ExpectRemoteCurlContains("nginx", ns, "localhost", nginxResp)
+		framework.ExpectLocalCurlContains("http://localhost:3000", nginxResp)
 
 		httpServerResp := "Hello World!"
-		framework.ExpectLocalCurlContents("http://localhost:8888", httpServerResp)
-		framework.ExpectRemoteCurlContents("nginx", ns, "localhost:8888", httpServerResp)
+		framework.ExpectLocalCurlContains("http://localhost:8888", httpServerResp)
+		framework.ExpectRemoteCurlContains("nginx", ns, "localhost:8888", httpServerResp)
 
 		cancel()
 		err = <-done

e2e/tests/portforward/portforward.go

@@ -100,7 +100,7 @@ sleep 1000000
 		framework.ExpectNoError(err)
 		defer framework.ExpectDeleteNamespace(kubeClient, ns)
 
-		buffer := &bytes.Buffer{}
+		buffer := &Buffer{}
 		devpod.DefaultTerminalStdout = buffer
 		devpod.DefaultTerminalStderr = buffer
 		devpod.DefaultTerminalStdin = nil
@@ -129,12 +129,10 @@ sleep 1000000
 		// wait until we get the first hostnames
 		var podName string
 		err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*3, true, func(_ context.Context) (done bool, err error) {
-			lines := strings.Split(buffer.String(), "\n")
-			if len(lines) <= 1 {
+			podName = lastTerminalPodName(buffer.String())
+			if podName == "" {
 				return false, nil
 			}
-
-			podName = strings.TrimSpace(lines[0])
 			return true, nil
 		})
 		framework.ExpectNoError(err)
@@ -169,12 +167,11 @@ sleep 1000000
 
 		// get new pod name
 		err = wait.PollUntilContextTimeout(context.TODO(), time.Second, time.Minute*3, true, func(_ context.Context) (done bool, err error) {
-			lines := strings.Split(buffer.String(), "\n")
-			if len(lines) <= 1 {
+			newPodName := lastTerminalPodName(buffer.String())
+			if newPodName == "" {
 				return false, nil
 			}
 
-			newPodName := strings.TrimSpace(lines[len(lines)-2])
 			if newPodName != podName {
 				podName = newPodName
 				return true, nil
@@ -240,3 +237,27 @@ func (s *Buffer) String() string {
 	defer s.mutex.Unlock()
 	return s.buffer.String()
 }
+
+func lastTerminalPodName(output string) string {
+	lines := strings.Split(output, "\n")
+	for i := len(lines) - 1; i >= 0; i-- {
+		line := sanitizeTerminalLine(lines[i])
+		if line != "" {
+			return line
+		}
+	}
+
+	return ""
+}
+
+func sanitizeTerminalLine(line string) string {
+	line = strings.Map(func(r rune) rune {
+		if r < 32 || r == 127 {
+			return -1
+		}
+
+		return r
+	}, line)
+
+	return strings.TrimSpace(line)
+}

e2e/tests/terminal/terminal.go

@@ -10,6 +10,7 @@ import (
 	"io/fs"
 	"net/http"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 	"sync"
@@ -129,16 +130,17 @@ func installDevSpaceHelperInContainer(ctx context.Context, client kubectl.Client
 		return err
 	}
 
-	curl := fmt.Sprintf("curl -L %s -o %s", url, DevSpaceHelperContainerPath)
-	chmod := fmt.Sprintf("chmod +x %s", DevSpaceHelperContainerPath)
+	tempHelperPath := newDevSpaceHelperTempContainerPath()
+	curl := fmt.Sprintf("curl -L %s -o %s", url, tempHelperPath)
+	chmod := fmt.Sprintf("chmod +x %s", tempHelperPath)
 	cmd := curl + " && " + chmod
 
 	stdout, stderr, err := client.ExecBuffered(ctx, pod, container, []string{"sh", "-c", cmd}, nil)
 	if err != nil {
 		return errors.Wrapf(err, "stdout, stderr: \n%s %s", string(stdout), string(stderr))
 	}
 
-	stdout, stderr, err = client.ExecBuffered(ctx, pod, container, []string{DevSpaceHelperContainerPath, "version"}, nil)
+	stdout, stderr, err = client.ExecBuffered(ctx, pod, container, []string{tempHelperPath, "version"}, nil)
 	if err != nil {
 		return errors.Wrapf(err, "stdout, stderr: \n%s %s", string(stdout), string(stderr))
 	}
@@ -147,9 +149,18 @@ func installDevSpaceHelperInContainer(ctx context.Context, client kubectl.Client
 		return fmt.Errorf("devspacehelper(%s) and devspace(%s) differs in version", string(stdout), version)
 	}
 
+	stdout, stderr, err = client.ExecBuffered(ctx, pod, container, []string{"mv", "-f", tempHelperPath, DevSpaceHelperContainerPath}, nil)
+	if err != nil {
+		return errors.Wrapf(err, "stdout, stderr: \n%s %s", string(stdout), string(stderr))
+	}
+
 	return nil
 }
 
+func newDevSpaceHelperTempContainerPath() string {
+	return fmt.Sprintf("%s.tmp-%d", DevSpaceHelperContainerPath, time.Now().UnixNano())
+}
+
 // getDownloadURL
 func devSpaceHelperDownloadURL(version, filename string) (string, error) {
 	if version == "latest" {
@@ -288,6 +299,8 @@ func injectSyncHelper(ctx context.Context, client kubectl.Client, pod *v1.Pod, c
 }
 
 func injectSyncHelperFromBytes(ctx context.Context, client kubectl.Client, pod *v1.Pod, container string, fi fs.FileInfo, bytesReader io.Reader) error {
+	tempHelperPath := newDevSpaceHelperTempContainerPath()
+	tempHelperName := path.Base(tempHelperPath)
 	writerComplete := make(chan struct{})
 	readerComplete := make(chan struct{})
 
@@ -342,7 +355,7 @@ func injectSyncHelperFromBytes(ctx context.Context, client kubectl.Client, pod *
 			return
 		}
 
-		hdr.Name = "devspacehelper"
+		hdr.Name = tempHelperName
 
 		// Set permissions correctly
 		hdr.Mode = 0777
@@ -381,5 +394,10 @@ func injectSyncHelperFromBytes(ctx context.Context, client kubectl.Client, pod *
 		<-writerComplete
 	}
 
+	stdout, stderr, err := client.ExecBuffered(ctx, pod, container, []string{"sh", "-c", fmt.Sprintf("chmod +x %s && mv -f %s %s", tempHelperPath, tempHelperPath, DevSpaceHelperContainerPath)}, nil)
+	if err != nil {
+		return errors.Wrapf(err, "stdout, stderr: \n%s %s", string(stdout), string(stderr))
+	}
+
 	return nil
 }