update noop impl.

mafredri · mafredri · commit 39526e647d67 · 2025-04-28T12:14:27.000Z
diff --git a/agent/agentcontainers/watcher/noop.go b/agent/agentcontainers/watcher/noop.go
@@ -5,7 +5,6 @@ import (
 	"sync"
 
 	"github.com/fsnotify/fsnotify"
-	"golang.org/x/xerrors"
 )
 
 // NewNoop creates a new watcher that does nothing.
@@ -27,20 +26,21 @@ func (*noopWatcher) Remove(string) error {
 	return nil
 }
 
+// Next blocks until the context is canceled or the watcher is closed.
 func (n *noopWatcher) Next(ctx context.Context) (*fsnotify.Event, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	case <-n.done:
-		return nil, xerrors.New("watcher closed")
+		return nil, ErrWatcherClosed
 	}
 }
 
 func (n *noopWatcher) Close() error {
 	n.mu.Lock()
 	defer n.mu.Unlock()
 	if n.closed {
-		return nil
+		return ErrWatcherClosed
 	}
 	n.closed = true
 	close(n.done)

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@ import (`
`5`	`5`	`"sync"`
`6`	`6`
`7`	`7`	`"github.com/fsnotify/fsnotify"`
`8`		`- "golang.org/x/xerrors"`
`9`	`8`	`)`
`10`	`9`
`11`	`10`	`// NewNoop creates a new watcher that does nothing.`
`@@ -27,20 +26,21 @@ func (*noopWatcher) Remove(string) error {`
`27`	`26`	`return nil`
`28`	`27`	`}`
`29`	`28`
	`29`	`+// Next blocks until the context is canceled or the watcher is closed.`
`30`	`30`	`func (n noopWatcher) Next(ctx context.Context) (fsnotify.Event, error) {`
`31`	`31`	`select {`
`32`	`32`	`case <-ctx.Done():`
`33`	`33`	`return nil, ctx.Err()`
`34`	`34`	`case <-n.done:`
`35`		`- return nil, xerrors.New("watcher closed")`
	`35`	`+ return nil, ErrWatcherClosed`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func (n *noopWatcher) Close() error {`
`40`	`40`	`n.mu.Lock()`
`41`	`41`	`defer n.mu.Unlock()`
`42`	`42`	`if n.closed {`
`43`		`- return nil`
	`43`	`+ return ErrWatcherClosed`
`44`	`44`	`}`
`45`	`45`	`n.closed = true`
`46`	`46`	`close(n.done)`