* lisp/filenotify.el (file-notify-rm-watch): Improve check for
calling low-level functions.
* test/automated/file-notify-tests.el (file-notify--test-timeout):
Decrase to 6 seconds for remote directories.
(file-notify-test02-events): Expect different number of
`attribute-changed' events for the local and remote cases. Apply
short delays between the operations, in order to receive all
events in the remote case. Combine `attribute-change' tests.
(Bug#21669)