Skip to content

Conversation

@bobsira
Copy link
Contributor

@bobsira bobsira commented Oct 13, 2025

No description provided.

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 13, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: bobsira
Once this PR has been reviewed and has the lgtm label, please assign spowelljr for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 13, 2025
@k8s-ci-robot
Copy link
Contributor

Hi @bobsira. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 13, 2025
@minikube-bot
Copy link
Collaborator

Can one of the admins verify this patch?

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.

// Normalize to platform-specific separators for consistency on Windows.
return filepath.Clean(filepath.FromSlash(minikubeHomeEnv))
}
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))
}

@bobsira
Copy link
Contributor Author

bobsira commented Oct 24, 2025

@nirs

func TestMiniPath(t *testing.T) {
	var testCases = []struct {
		env, basePath string
	}{
		{"/tmp/.minikube", "/tmp/"},
		{"/tmp/", "/tmp"},
		{"", homedir.HomeDir()},
	}
	for _, tc := range testCases {
		t.Run(tc.env, func(t *testing.T) {
			expectedPath := filepath.Join(tc.basePath, ".minikube")
			t.Setenv(MinikubeHome, tc.env)
			path := MiniPath()
			if path != expectedPath {
				t.Errorf("MiniPath expected to return '%s', but got '%s'", expectedPath, path)
			}
		})
	}
}

Looking at TestMiniPath it fails on Windows because users often set MINIKUBE_HOME with forward slashes (e.g. C:/Users/Alice/.minikube), and the current implementation of MiniPath() returned that raw value unchanged when it already ended in .minikube, while other branches build the path using filepath.Join, which on Windows emits backslashes; the filesystem accepts both, but our test performs a strict string equality, so the expected path (backslashes) and actual path (forward slashes) diverge despite referring to the same directory. By normalizing the chosen path with filepath.Clean(filepath.FromSlash(...)), we enforce one canonical, native-separator, no-trailing-slash representation, eliminating flaky equality failures, preventing subtle cache/map key mismatches, and centralizing path cleanup so every caller gets a consistent result without masking truly invalid paths (bad values still fail later during actual file operations).

@bobsira bobsira changed the title Fixed TestMiniPath unit test failure on Windows test: Fix TestMiniPath unit test on windows Oct 24, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants