Fixed TestAssetsFromDir unit test failure on Windows #21742
Conversation
bobsira
commented
Oct 13, 2025
bobsira
commented
- Added a t.Cleanup hook that iterates over every CopyableFile returned by assetsFromDir and calls Close(). This releases the open file descriptors created by assets.NewFileAsset.
- This directly fixes the Windows test failure where RemoveAll couldn’t delete temp files because they were still open.
- Switched some non-fatal t.Errorf + return cases to t.Fatalf for earlier, clearer abort when setup fails (creating test files or gathering assets).
k8s-ci-robot
added
the
cncf-cla: yes
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: bobsira 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 |
k8s-ci-robot
added
the
needs-ok-to-test
|
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 Once the patch is verified, the new status will be reflected by the 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. |
|
Can one of the admins verify this patch? |
k8s-ci-robot
added
the
size/M
| }, | ||
| {relativePath: "/dir1/file1.txt", expectedPath: vmpath.GuestAddonsDir}, | ||
| {relativePath: "/dir1/file2.txt", expectedPath: vmpath.GuestAddonsDir}, | ||
| {relativePath: "/dir2/file1.txt", expectedPath: vmpath.GuestAddonsDir}, |
There was a problem hiding this comment.
Is this related to the fix?
Not adding unrelated changes will help to fix the windows issues quicker. We can do these formatting changes later after the windows tests are stable.
| } | ||
|
|
||
| // Ensure file descriptors opened by assets.NewFileAsset are released (critical on Windows). | ||
| t.Cleanup(func() { |
There was a problem hiding this comment.
This must be called before calling assetsFromDir().
| if err != nil { | ||
| t.Errorf("got unexpected error adding minikube dir assets: %v", err) | ||
| return | ||
| t.Fatalf("got unexpected error adding minikube dir assets: %v", err) |
There was a problem hiding this comment.
It this test fail here, the cleanup will not run since we call it only after this failure.
| if err != nil { | ||
| t.Errorf("unable to create file on fs: %v", err) | ||
| return | ||
| t.Fatalf("unable to create file on fs: %v", err) |
There was a problem hiding this comment.
This is a good change but related to the windows fix.
| if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil { | ||
| return err | ||
| } | ||
| want[path] = fileDef.expectedPath |
There was a problem hiding this comment.
Is this change related to the windows fix? Let's focus on one change in this commit. If you have more fixed let's do them later.
I'm also not sure this is correct, previous intentionally added the path before checking for errors.
4 participants
