kqueue: don't change internal state when Add() returns error (#638)

Fixes #637
fsnotify · May 16, 2024 · 800ed83 · 800ed83
1 parent ad74244
commit 800ed83
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 2 deletions.
diff --git a/backend_fen_test.go b/backend_fen_test.go
@@ -43,6 +43,12 @@ func TestRemoveState(t *testing.T) {
 
 	check(1, 1)
 
+	// Shouldn't change internal state.
+	if err := w.Add("/path-doesnt-exist"); err == nil {
+		t.Fatal(err)
+	}
+	check(1, 1)
+
 	if err := w.Remove(file); err != nil {
 		t.Fatal(err)
 	}

diff --git a/backend_inotify_test.go b/backend_inotify_test.go
@@ -34,6 +34,12 @@ func TestRemoveState(t *testing.T) {
 
 	check(2)
 
+	// Shouldn't change internal state.
+	if err := w.Add("/path-doesnt-exist"); err == nil {
+		t.Fatal(err)
+	}
+	check(2)
+
 	if err := w.Remove(file); err != nil {
 		t.Fatal(err)
 	}

diff --git a/backend_kqueue.go b/backend_kqueue.go
@@ -303,9 +303,12 @@ func (w *kqueue) AddWith(name string, opts ...addOpt) error {
 		return fmt.Errorf("%w: %s", xErrUnsupported, with.op)
 	}
 
-	w.watches.addUserWatch(name)
 	_, err := w.addWatch(name, noteAllEvents)
-	return err
+	if err != nil {
+		return err
+	}
+	w.watches.addUserWatch(name)
+	return nil
 }
 
 func (w *kqueue) Remove(name string) error {

diff --git a/backend_kqueue_test.go b/backend_kqueue_test.go
@@ -53,6 +53,12 @@ func TestRemoveState(t *testing.T) {
 
 	check(2, 3)
 
+	// Shouldn't change internal state.
+	if err := w.Add("/path-doesnt-exist"); err == nil {
+		t.Fatal(err)
+	}
+	check(2, 3)
+
 	if err := w.Remove(file); err != nil {
 		t.Fatal(err)
 	}

diff --git a/backend_windows_test.go b/backend_windows_test.go
@@ -38,6 +38,12 @@ func TestRemoveState(t *testing.T) {
 
 	check(2)
 
+	// Shouldn't change internal state.
+	if err := w.Add("/path-doesnt-exist"); err == nil {
+		t.Fatal(err)
+	}
+	check(2)
+
 	if err := w.Remove(file); err != nil {
 		t.Fatal(err)
 	}