Test coverage for some recent changes to --timeout

Duplicate the tests for both inotifywait and inotifywatch until I find a
better way to handle them together.