Fix a flaky test and work around issue 16003 in pkg/watcher.

pkg/watcher/test/directory_watcher/mac_os_test.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:scheduled_test/scheduled_test.dart';
 import 'package:watcher/src/directory_watcher/mac_os.dart';
 import 'package:watcher/watcher.dart';
 
 import 'shared.dart';
 import '../utils.dart';
@@ skipping 18 matching lines @@
     createDir("dir");
     writeFile("dir/old.txt");
     deleteDir("dir");
     createDir("dir");
 
     startWatcher(dir: "dir");
     writeFile("dir/newer.txt");
     expectAddEvent("dir/newer.txt");
   });
 
-  // TODO(nweiz): re-enable this when issue 16003 is fixed.
-  // test('emits events for many nested files moved out then immediately back in',
-  //     () {
-  //   withPermutations((i, j, k) =>
-  //       writeFile("dir/sub/sub-$i/sub-$j/file-$k.txt"));
+  test('emits events for many nested files moved out then immediately back in',
+      () {
+    withPermutations((i, j, k) =>
+        writeFile("dir/sub/sub-$i/sub-$j/file-$k.txt"));
 
-  //   startWatcher(dir: "dir");
+    startWatcher(dir: "dir");
 
-  //   renameDir("dir/sub", "sub");
-  //   renameDir("sub", "dir/sub");
+    renameDir("dir/sub", "sub");
+    renameDir("sub", "dir/sub");
 
-  //   allowEither(() {
-  //     inAnyOrder(withPermutations((i, j, k) =>
-  //         isRemoveEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
+    allowEither(() {
+      inAnyOrder(withPermutations((i, j, k) =>
+          isRemoveEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
 
-  //     inAnyOrder(withPermutations((i, j, k) =>
-  //         isAddEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
-  //   }, () {
-  //     inAnyOrder(withPermutations((i, j, k) =>
-  //         isModifyEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
-  //   });
-  // });
+      inAnyOrder(withPermutations((i, j, k) =>
+          isAddEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
+    }, () {
+      inAnyOrder(withPermutations((i, j, k) =>
+          isModifyEvent("dir/sub/sub-$i/sub-$j/file-$k.txt")));
+    });
+  });
 }