Work around a flake in the Mac OS watcher test on the bots.

Issues 14373 and 14793 were tag-teaming to cause no_subscription_test
to fail for the Mac OS watcher occasionally.

This also marks directory_watcher/mac_os_test as timing out, apparently due to
issue 14943.

R=rnystrom@google.com
BUG=

Review URL: https://codereview.chromium.org//59143006

git-svn-id: https://dart.googlecode.com/svn/branches/bleeding_edge/dart/pkg/watcher@30174 260f80e4-7a28-3924-810f-c04153c831b5

pkgs/watcher/test/no_subscription/shared.dart

diff --git a/pkgs/watcher/test/no_subscription/shared.dart b/pkgs/watcher/test/no_subscription/shared.dart
index 6623ba3..de625d5 100644
--- a/pkgs/watcher/test/no_subscription/shared.dart
+++ b/pkgs/watcher/test/no_subscription/shared.dart
@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:async';
+import 'dart:io';
 
 import 'package:scheduled_test/scheduled_test.dart';
 import 'package:watcher/watcher.dart';

pkgs/watcher/test/utils.dart

diff --git a/pkgs/watcher/test/utils.dart b/pkgs/watcher/test/utils.dart
index 651fd6d..136c8b0 100644
--- a/pkgs/watcher/test/utils.dart
+++ b/pkgs/watcher/test/utils.dart
@@ -198,7 +198,7 @@
 
 /// Returns a matcher that matches a [WatchEvent] with the given [type] and
 /// [path].
-Match isWatchEvent(ChangeType type, String path) {
+Matcher isWatchEvent(ChangeType type, String path) {
   return predicate((e) {
     return e is WatchEvent && e.type == type &&
         e.path == p.join(_sandboxDir, p.normalize(path));