RemoveWatch is not removing the path from the watch list

[mdwhatcott]

I'm running Go 1.1.2 on Mac OS Lion (x64). I've included some test code below. Am I missing something?

package stuff

import (
    "github.com/howeyc/fsnotify"
    "os"
    "os/exec"
    "testing"
    "time"
)

func TestRemovalOfWatch(t *testing.T) {
    defer exec.Command("rm", "file.txt").Run() // cleanup file system after test

    exec.Command("touch", "file.txt").Run()

    watcher, err := fsnotify.NewWatcher()
    if err != nil {
        panic(err)
    }
    defer watcher.Close()

    working, _ := os.Getwd()
    watcher.Watch(working)
    err = watcher.RemoveWatch(working)
    if err != nil {
        t.Fatalf("Could not remove the watch: %v\n", err)
    }

    go func() {
        for {
            select {
            case ev := <-watcher.Event:
                t.Errorf("We should no longer be watching anything but we received this event:\n%v", ev)
            }
        }
    }()

    time.Sleep(1 * time.Second) // let the RemoveWatch sink in?
    exec.Command("touch", "file.txt").Run()
    time.Sleep(1 * time.Second) // allow time for the event to propogate
}

/* OUTPUT
$ go test
--- FAIL: TestRemovalOfWatch (2.02 seconds)
    stuff_test.go:33: We should no longer be watching anything but we received this event:
        "/Users/mike/work/dev/gopath/src/github.com/mdwhatcott/stuff/file.txt": MODIFY
FAIL
exit status 1
FAIL    github.com/smartystreets/stuff  2.035s

*/

[howeyc]

What you were doing is correct. I had an issue in the library that files watched for a user directory watch were not being unwatched when the user's directory watch was removed.

Whenever you get a chance please try with the latest changes made and report if this behaves as expected.

[mdwhatcott]

That worked @howeyc! Thanks for the quick fix.