Skip to content

test: Fix TestMiniPath unit test on windows #21739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −1
Open

test: Fix TestMiniPath unit test on windows #21739

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion pkg/minikube/localpath/localpath.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ func MiniPath() string {
return filepath.Join(homedir.HomeDir(), ".minikube")
}
if filepath.Base(minikubeHomeEnv) == ".minikube" {
return minikubeHomeEnv
// Normalize to platform-specific separators for consistency on Windows.
return filepath.Clean(filepath.FromSlash(minikubeHomeEnv))
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is value from the MINIKUBE_HOME environment variable. Why do we need to fix value set by the user? they should set the right value, and it the path is invalid the minikube command should fail.

If the issue comes from a test using wrong path, we should fix the test, not the code.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We’re not correcting a bad user value; we’re standardizing a valid path so it has one canonical string form. Windows accepts forward slashes, but raw string comparisons (tests, map keys, logs) treat “C:/Users/Alice/.minikube” and “C:\Users\Alice.minikube” as different. Without normalization this causes flaky tests, cache/key mismatches, and forces every caller to remember to clean paths. Centralizing normalization in MiniPath() creates a consistent invariant (clean, native separators, no trailing slash), reduces maintenance, and doesn’t hide truly invalid paths (bad paths still fail later). So the change solves a real cross‑platform consistency problem, not just a test artifact.

}
return filepath.Join(minikubeHomeEnv, ".minikube")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

However if we need to fix the value for the user, why we don't need to fix it in this case?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good point—the most consistent approach is to canonicalize the final result unconditionally, not just one branch. The branch-specific change was a minimal surgical patch targeting the exact failing scenario (raw env already points at .minikube). A cleaner follow-up is:

func MiniPath() string {
	minikubeHomeEnv := os.Getenv(MinikubeHome)
	var p string
	switch {
	case minikubeHomeEnv == "":
		p = filepath.Join(homedir.HomeDir(), ".minikube")
	case filepath.Base(minikubeHomeEnv) == ".minikube":
		p = minikubeHomeEnv
	default:
		p = filepath.Join(minikubeHomeEnv, ".minikube")
	}
	return filepath.Clean(filepath.FromSlash(p))
}

}
Expand Down
Loading