Wait a bit longer in TestInotifyDeleteOpenFile()

Solves some intermittent test failures on my laptop.

diff --git a/backend_inotify.go b/backend_inotify.go
index d9cb3a0286e09f8fc02416209cc03a212d4bb4dd..654ee27f339a67e06ccba02aef13c0c430da9216 100644 (file)
--- a/backend_inotify.go
+++ b/backend_inotify.go
@@ -408,14 +408,11 @@ func (w *Watcher) readEvents() {
                if n < unix.SizeofInotifyEvent {
                        var err error
                        if n == 0 {
-                               // If EOF is received. This should really never happen.
-                               err = io.EOF
+                               err = io.EOF // If EOF is received. This should really never happen.
                        } else if n < 0 {
-                               // If an error occurred while reading.
-                               err = errno
+                               err = errno // If an error occurred while reading.
                        } else {
-                               // Read was too short.
-                               err = errors.New("notify: short read in readEvents()")
+                               err = errors.New("notify: short read in readEvents()") // Read was too short.
                        }
                        if !w.sendError(err) {
                                return

diff --git a/backend_inotify_test.go b/backend_inotify_test.go
index 6965ee19dcb960dff5a7d19d9f76134e57c097c2..65a45b9df25cc6e30ed1e5336c95d8ebeffddf81 100644 (file)
--- a/backend_inotify_test.go
+++ b/backend_inotify_test.go
@@ -93,7 +93,7 @@ func TestInotifyDeleteOpenFile(t *testing.T) {
        w.collect(t)
 
        rm(t, file)
-       eventSeparator()
+       waitForEvents()
        e := w.events(t)
        cmpEvents(t, tmp, e, newEvents(t, `chmod /file`))