Merge pull request #174 from dnephin/wrap-errors-in-watch

Wrap a couple errors from filewatcher

cmd/main.go

@@ -231,10 +231,10 @@ func finishRun(opts *options, exec *testjson.Execution, exitErr error) error {
 	testjson.PrintSummary(opts.stdout, exec, opts.hideSummary.value)
 
 	if err := writeJUnitFile(opts, exec); err != nil {
-		return err
+		return fmt.Errorf("failed to write junit file: %w", err)
 	}
 	if err := postRunHook(opts, exec); err != nil {
-		return err
+		return fmt.Errorf("post run command failed: %w", err)
 	}
 	return exitErr
 }

cmd/watch.go

@@ -26,7 +26,7 @@ func (w *watchRuns) run(runOpts filewatcher.RunOptions) error {
 	if runOpts.Debug {
 		path, cleanup, err := delveInitFile(w.prevExec)
 		if err != nil {
-			return err
+			return fmt.Errorf("failed to write delve init file: %w", err)
 		}
 		defer cleanup()
 		o := delveOpts{
@@ -35,7 +35,7 @@ func (w *watchRuns) run(runOpts filewatcher.RunOptions) error {
 			initFilePath: path,
 		}
 		if err := runDelve(o); !isExitCoder(err) {
-			return err
+			return fmt.Errorf("delve failed: %w", err)
 		}
 		return nil
 	}

internal/filewatcher/watch.go

@@ -28,14 +28,14 @@ func Watch(dirs []string, run func(opts RunOptions) error) error {
 	toWatch := findAllDirs(dirs, maxDepth)
 	watcher, err := fsnotify.NewWatcher()
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to create file watcher: %w", err)
 	}
-	defer watcher.Close() // nolint: errcheck
+	defer watcher.Close() // nolint: errcheck // always returns nil error
 
 	fmt.Printf("Watching %v directories. Use Ctrl-c to to stop a run or exit.\n", len(toWatch))
 	for _, dir := range toWatch {
 		if err = watcher.Add(dir); err != nil {
-			return err
+			return fmt.Errorf("failed to watch directory %v: %w", dir, err)
 		}
 	}