cleanup

Author: Kévin Dunglas

internal/watcher/pattern.go

@@ -44,8 +44,9 @@ func (p *pattern) parse() (err error) {
 	splitPattern := strings.Split(absPattern, string(filepath.Separator))
 	patternWithoutDir := ""
 	for i, part := range splitPattern {
+		// add a \ after the drive letter on Windows to force filepath.Join to work as expected
 		if i == 0 && runtime.GOOS == "windows" {
-			splitPattern[i] = splitPattern[0] + "\\"
+			splitPattern[0] = splitPattern[0] + "\\"
 		}
 
 		isFilename := i == len(splitPattern)-1 && strings.Contains(part, ".")

watcher_test.go

@@ -63,15 +63,10 @@ func pollForWorkerReset(t *testing.T, handler func(http.ResponseWriter, *http.Re
 	return false
 }
 
-func updateTestFile(t *testing.T, fileName string, content string) {
+func updateTestFile(t *testing.T, fileName, content string) {
 	absFileName, err := filepath.Abs(fileName)
 	require.NoError(t, err)
 
-	dirName := filepath.Dir(absFileName)
-	if _, err = os.Stat(dirName); os.IsNotExist(err) {
-		err = os.MkdirAll(dirName, 0700)
-	}
-	require.NoError(t, err)
-
+	require.NoError(t, os.MkdirAll(filepath.Dir(absFileName), 0700))
 	require.NoError(t, os.WriteFile(absFileName, []byte(content), 0644))
 }