revert path normailization + increase timeout on windows (runners are

slower)

Signed-off-by: Guillaume de Rouville <guillaume@dagger.io>

Author: grouville

environment/integration/integration_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strconv"
 	"strings"
 	"testing"
@@ -202,14 +203,17 @@ func TestLargeProjectPerformance(t *testing.T) {
 		WithRepository(t, "large_project_performance", largeProjectSetup, func(t *testing.T, repo *repository.Repository, user *UserActions) {
 			env := user.CreateEnvironment("Performance Test", "Testing performance with large project")
 
-			// Time file operations
 			start := time.Now()
 			user.FileWrite(env.ID, "new.txt", "test", "Test write performance")
 			writeTime := time.Since(start)
 
 			t.Logf("File write took: %v", writeTime)
 
-			assert.LessOrEqual(t, writeTime, 2*time.Second, "File write should be fast")
+			threshold := 2 * time.Second
+			if runtime.GOOS == "windows" {
+				threshold = 5 * time.Second
+			}
+			assert.LessOrEqual(t, writeTime, threshold, "File write should be fast")
 		})
 	})
 }

repository/git.go

@@ -11,7 +11,6 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"slices"
 	"strings"
 
@@ -82,12 +81,12 @@ func getContainerUseRemote(ctx context.Context, repo string) (string, error) {
 
 	cuRemote = strings.TrimSpace(cuRemote)
 
-	// Convert file:// URLs back to paths on Windows
-	if runtime.GOOS == "windows" && strings.HasPrefix(cuRemote, "file://") {
-		// Remove file:// prefix and convert slashes back
-		cuRemote = strings.TrimPrefix(cuRemote, "file://")
-		cuRemote = filepath.FromSlash(cuRemote)
-	}
+	// // Convert file:// URLs back to paths on Windows
+	// if runtime.GOOS == "windows" && strings.HasPrefix(cuRemote, "file://") {
+	// 	// Remove file:// prefix and convert slashes back
+	// 	cuRemote = strings.TrimPrefix(cuRemote, "file://")
+	// 	cuRemote = filepath.FromSlash(cuRemote)
+	// }
 
 	return cuRemote, nil
 }

repository/repository.go

@@ -152,21 +152,21 @@ func (r *Repository) ensureUserRemote(ctx context.Context) error {
 			if !errors.Is(err, os.ErrNotExist) {
 				return err
 			}
-			// Convert Windows paths to file:// URLs for git remotes
+			// // Convert Windows paths to file:// URLs for git remotes
 			remotePath := r.forkRepoPath
-			if runtime.GOOS == "windows" {
-				remotePath = "file://" + filepath.ToSlash(r.forkRepoPath)
-			}
+			// if runtime.GOOS == "windows" {
+			// 	remotePath = "file://" + filepath.ToSlash(r.forkRepoPath)
+			// }
 			_, err := RunGitCommand(ctx, r.userRepoPath, "remote", "add", containerUseRemote, remotePath)
 			return err
 		}
 
 		if currentForkPath != r.forkRepoPath {
-			// Convert Windows paths to file:// URLs for git remotes
+			// // Convert Windows paths to file:// URLs for git remotes
 			remotePath := r.forkRepoPath
-			if runtime.GOOS == "windows" {
-				remotePath = "file://" + filepath.ToSlash(r.forkRepoPath)
-			}
+			// if runtime.GOOS == "windows" {
+			// 	remotePath = "file://" + filepath.ToSlash(r.forkRepoPath)
+			// }
 			_, err := RunGitCommand(ctx, r.userRepoPath, "remote", "set-url", containerUseRemote, remotePath)
 			return err
 		}

repository/repository_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"os"
 	"path/filepath"
-	"runtime"
 	"strings"
 	"testing"
 
@@ -66,12 +65,12 @@ func TestRepositoryOpen(t *testing.T) {
 		require.NoError(t, err)
 		remote = strings.TrimSpace(remote)
 
-		// Convert file:// URLs back to paths on Windows
-		if runtime.GOOS == "windows" && strings.HasPrefix(remote, "file://") {
-			// Remove file:// prefix and convert slashes back
-			remote = strings.TrimPrefix(remote, "file://")
-			remote = filepath.FromSlash(remote)
-		}
+		// // Convert file:// URLs back to paths on Windows
+		// if runtime.GOOS == "windows" && strings.HasPrefix(remote, "file://") {
+		// 	// Remove file:// prefix and convert slashes back
+		// 	remote = strings.TrimPrefix(remote, "file://")
+		// 	remote = filepath.FromSlash(remote)
+		// }
 
 		assert.Equal(t, repo.forkRepoPath, remote)
 	})