fileinformer: update usages for fsnotify

Author: jzelinskie

fileinformer/file_informer.go

@@ -250,24 +250,22 @@ func (f *FileSharedIndexInformer) Run(stopCh <-chan struct{}) {
 						continue
 					}
 					f.log.V(4).Info("filewatcher got event", "event", event.String(), "event_name", event.Name)
-					if event.Op&fsnotify.Write == fsnotify.Write ||
-						event.Op&fsnotify.Create == fsnotify.Create {
+					if event.Has(fsnotify.Write) || event.Has(fsnotify.Create) {
 						f.RLock()
 						for _, h := range f.handlers {
 							h.OnAdd(fileName)
 						}
 						f.RUnlock()
 					}
 					// chmod is the event from a configmap reload in kube
-					if event.Op&fsnotify.Rename == fsnotify.Rename ||
-						event.Op&fsnotify.Chmod == fsnotify.Chmod {
+					if event.Has(fsnotify.Rename) || event.Has(fsnotify.Chmod) {
 						f.RLock()
 						for _, h := range f.handlers {
 							h.OnUpdate(fileName, fileName)
 						}
 						f.RUnlock()
 					}
-					if event.Op&fsnotify.Remove == fsnotify.Remove {
+					if event.Has(fsnotify.Remove) {
 						f.RLock()
 						for _, h := range f.handlers {
 							h.OnDelete(fileName)

fileinformer/file_informer_test.go

@@ -77,8 +77,15 @@ func TestFileInformer(t *testing.T) {
 	require.Eventually(t, func() bool {
 		eventHandlers.Lock()
 		defer eventHandlers.Unlock()
-		return len(eventHandlers.Calls) == 4
-	}, 5000*time.Millisecond, 100*time.Millisecond)
+
+		foundDelete := false
+		for _, call := range eventHandlers.Calls {
+			if call.Method == "OnDelete" {
+				foundDelete = true
+			}
+		}
+		return foundDelete
+	}, 500*time.Millisecond, 10*time.Millisecond)
 
 	cancel()