- switch local and remote curl assertions to substring checks for dynamic HTTP responses

- add per-run build markers to restarthelper fixtures to avoid cached image reuse
- retry sync writes until the remote file reflects the change instead of assuming watcher readiness
- sanitize terminal output parsing so pod name detection is resilient to control characters
- deduplicate image tag lookup logic in build tests
- clean up env var set/unset handling across e2e tests to satisfy errcheck

Author: zerbitx

e2e/framework/helper.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/tests/build/build.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/command/command.go

@@ -73,7 +73,7 @@ var _ = DevSpaceDescribe("command", func() {
 		framework.ExpectNoError(err)
 		defer framework.CleanupTempDir(initialDir, tempDir)
 
-		defer os.Unsetenv("KUBECONFIG")
+		defer os.Unsetenv("KUBECONFIG") //nolint:errcheck
 		err = os.Setenv("KUBECONFIG", filepath.Join(tempDir, "config"))
 		framework.ExpectNoError(err)