github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 02:34:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #116627 from claudiubelu/unittests-8

Browse Source 
unittests: Fixes unit tests for Windows (part 8)
This commit is contained in:
Kubernetes Prow Robot 2024-01-17 05:43:54 +01:00 committed by GitHub
commit 909faa3a9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/volume/flexvolume/probe.go
View File

@ -228,6 +228,10 @@ func (prober *flexVolumeProber) updateEventsMap(eventDirAbs string, op volume.Pr
// Each file or directory change triggers two events: one from the watch on itself, another from the watch // Each file or directory change triggers two events: one from the watch on itself, another from the watch
// on its parent directory. // on its parent directory.
func (prober *flexVolumeProber) addWatchRecursive(filename string) error { func (prober *flexVolumeProber) addWatchRecursive(filename string) error {
// this may be called with an actual absolute path on Windows (with a C:\ prefix).
// But the prober.fs.Walk below will execute filepath.Join(fs.root, filenameAbove), which
// will result in an incorrect path, you can't join C:\path and C:\another\path.
filename = strings.TrimPrefix(filename, `C:\`)
addWatch := func(path string, info os.FileInfo, err error) error { addWatch := func(path string, info os.FileInfo, err error) error {
if err == nil && info.IsDir() { if err == nil && info.IsDir() {
if err := prober.watcher.AddWatch(path); err != nil { if err := prober.watcher.AddWatch(path); err != nil {

15
pkg/volume/flexvolume/probe_test.go
View File

@ -72,11 +72,6 @@ func TestProberExistingDriverBeforeInit(t *testing.T) {
// Probes newly added drivers after prober is running. // Probes newly added drivers after prober is running.
func TestProberAddRemoveDriver(t *testing.T) { func TestProberAddRemoveDriver(t *testing.T) {
// Skip tests that fail on Windows, as discussed during the SIG Testing meeting from January 10, 2023
if goruntime.GOOS == "windows" {
t.Skip("Skipping test that fails on Windows")
}
// Arrange // Arrange
_, fs, watcher, prober := initTestEnvironment(t) _, fs, watcher, prober := initTestEnvironment(t)
prober.Probe() prober.Probe()
@ -210,11 +205,6 @@ func TestEmptyPluginDir(t *testing.T) {
// Issue an event to remove plugindir. New directory should still be watched. // Issue an event to remove plugindir. New directory should still be watched.
func TestRemovePluginDir(t *testing.T) { func TestRemovePluginDir(t *testing.T) {
// Skip tests that fail on Windows, as discussed during the SIG Testing meeting from January 10, 2023
if goruntime.GOOS == "windows" {
t.Skip("Skipping test that fails on Windows")
}
// Arrange // Arrange
driverPath, fs, watcher, _ := initTestEnvironment(t) driverPath, fs, watcher, _ := initTestEnvironment(t)
err := fs.RemoveAll(pluginDir) err := fs.RemoveAll(pluginDir)
@ -236,11 +226,6 @@ func TestRemovePluginDir(t *testing.T) {
// Issue an event to remove plugindir. New directory should still be watched. // Issue an event to remove plugindir. New directory should still be watched.
func TestNestedDriverDir(t *testing.T) { func TestNestedDriverDir(t *testing.T) {
// Skip tests that fail on Windows, as discussed during the SIG Testing meeting from January 10, 2023
if goruntime.GOOS == "windows" {
t.Skip("Skipping test that fails on Windows")
}
// Arrange // Arrange
_, fs, watcher, _ := initTestEnvironment(t) _, fs, watcher, _ := initTestEnvironment(t)
// Assert // Assert