Merge pull request #2742 from stephentoub/change_fsw_timeouts

Change timeouts on FSW tests

Author: stephentoub

src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Created.cs

@@ -125,7 +125,7 @@ public static void FileSystemWatcher_Created_FileCreatedInNestedDirectory()
         {
             using (var nestedFile = new TemporaryTestFile(Path.Combine(ttd.Path, "nestedFile")))
             {
-                Utility.ExpectEvent(are, "nested file created", 1000 * 30);
+                Utility.ExpectEvent(are, "nested file created");
             }
         });
     }

src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Deleted.cs

@@ -102,17 +102,17 @@ public static void FileSystemWatcher_Deleted_NestedDirectories()
             using (var firstDir = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir1")))
             {
                 // Wait for the created event
-                Utility.ExpectEvent(createOccured, "create", 1000 * 30);
+                Utility.ExpectEvent(createOccured, "create");
 
                 using (var secondDir = new TemporaryTestDirectory(Path.Combine(firstDir.Path, "dir2")))
                 {
                     // Wait for the created event
-                    Utility.ExpectEvent(createOccured, "create", 1000 * 30);
+                    Utility.ExpectEvent(createOccured, "create");
 
                     using (var nestedDir = new TemporaryTestDirectory(Path.Combine(secondDir.Path, "nested")))
                     {
                         // Wait for the created event
-                        Utility.ExpectEvent(createOccured, "create", 1000 * 30);
+                        Utility.ExpectEvent(createOccured, "create");
                     }
 
                     Utility.ExpectEvent(eventOccured, "deleted");
@@ -142,12 +142,12 @@ public static void FileSystemWatcher_Deleted_FileDeletedInNestedDirectory()
             using (var firstDir = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir1")))
             {
                 // Wait for the created event
-                Utility.ExpectEvent(createOccured, "create", 1000 * 30);
+                Utility.ExpectEvent(createOccured, "create");
 
                 using (var secondDir = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir2")))
                 {
                     // Wait for the created event
-                    Utility.ExpectEvent(createOccured, "create", 1000 * 30);
+                    Utility.ExpectEvent(createOccured, "create");
 
                     using (var nestedDir = new TemporaryTestFile(Path.Combine(secondDir.Path, "nestedFile"))) { }
 

src/System.IO.FileSystem.Watcher/tests/FileSystemWatcher.Renamed.cs

@@ -75,7 +75,7 @@ public static void FileSystemWatcher_Renamed_FileInNestedDirectory()
         {
             using (var nestedFile = new TemporaryTestFile(Path.Combine(ttd.Path, "nestedFile")))
             {
-                Utility.ExpectEvent(are, "file created", Utility.WaitForCreationTimeoutInMs);
+                Utility.ExpectEvent(are, "file created");
                 nestedFile.Move(nestedFile.Path + "_2");
                 Utility.ExpectEvent(are, "renamed");
             }
@@ -103,11 +103,11 @@ public static void FileSystemWatcher_Moved_NestedDirectoryRoot()
 
             using (var dir1 = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir1")))
             {
-                Utility.ExpectEvent(createdOccured, "dir1 created", Utility.WaitForCreationTimeoutInMs);
+                Utility.ExpectEvent(createdOccured, "dir1 created");
 
                 using (var dir2 = new TemporaryTestDirectory(Path.Combine(dir1.Path, "dir2")))
                 {
-                    Utility.ExpectEvent(createdOccured, "dir2 created", Utility.WaitForCreationTimeoutInMs);
+                    Utility.ExpectEvent(createdOccured, "dir2 created");
 
                     using (var file = Utility.CreateTestFile(Path.Combine(dir2.Path, "test file"))) { };
 
@@ -146,7 +146,7 @@ public static void FileSystemWatcher_Moved_NestedDirectoryRootWithoutSubdirector
 
             using (var dir1 = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir1")))
             {
-                Utility.ExpectEvent(createdOccured, "dir1 created", Utility.WaitForCreationTimeoutInMs);
+                Utility.ExpectEvent(createdOccured, "dir1 created");
 
                 using (var dir2 = new TemporaryTestDirectory(Path.Combine(dir1.Path, "dir2")))
                 {

src/System.IO.FileSystem.Watcher/tests/Utility/Utility.cs

@@ -3,25 +3,31 @@
 
 using System;
 using System.IO;
-using System.Threading;
 using System.Runtime.CompilerServices;
-using Xunit;
 using System.Runtime.InteropServices;
+using System.Threading;
+using Xunit;
 
 public static class Utility
 {
     // These pinvokes are used only for tests and not by the src
     [DllImport("Kernel32.dll", EntryPoint = "CreateSymbolicLinkW", SetLastError = true)]
     private static extern byte CreateSymbolicLink(string linkName, string targetFileName, int flags);
+
     [DllImport("libc", SetLastError = true)]
     private static extern int symlink(string oldPath, string newPath);
 
-    // events are reported asynchronously by the OS, so allow an amount of time for
-    // them to arrive before testing an assertion.
-    public const int Timeout = 500;
-    public const int WaitForCreationTimeoutInMs = 1000 * 30;
     private const int SYMBOLIC_LINK_FLAG_DIRECTORY = 0x1;
 
+    // Events are reported asynchronously by the OS, so allow an amount of time for
+    // them to arrive before testing an assertion.  If we expect an event to occur,
+    // we can wait for it for a relatively long time, as if it doesn't arrive, we're
+    // going to fail the test.  If we don't expect an event to occur, then we need
+    // to keep the timeout short, as in a successful run we'll end up waiting for
+    // the entire timeout specified.
+    public const int WaitForExpectedEventTimeout = 30000;
+    public const int WaitForUnexpectedEventTimeout = 500;
+
     public static TemporaryTestFile CreateTestFile([CallerMemberName] string path = null)
     {
         if (String.IsNullOrEmpty(path))
@@ -97,15 +103,15 @@ public static AutoResetEvent WatchForEvents(FileSystemWatcher watcher, WatcherCh
         return eventOccured;
     }
 
-    public static void ExpectEvent(WaitHandle eventOccured, string eventName, int timeout = Utility.Timeout)
+    public static void ExpectEvent(WaitHandle eventOccured, string eventName, int timeout = WaitForExpectedEventTimeout)
     {
         string message = String.Format("Didn't observe a {0} event within {1}ms", eventName, timeout);
         Assert.True(eventOccured.WaitOne(timeout), message);
     }
 
-    public static void ExpectNoEvent(WaitHandle eventOccured, string eventName, int timeout = Utility.Timeout)
+    public static void ExpectNoEvent(WaitHandle eventOccured, string eventName, int timeout = WaitForUnexpectedEventTimeout)
     {
-        string message = String.Format("Should not observe a {0} event", eventName);
+        string message = String.Format("Should not observe a {0} event within {1}ms", eventName, timeout);
         Assert.False(eventOccured.WaitOne(timeout), message);
     }
 
@@ -128,11 +134,11 @@ public static void TestNestedDirectoriesHelper(
 
             using (var firstDir = new TemporaryTestDirectory(Path.Combine(dir.Path, "dir1")))
             {
-                Utility.ExpectEvent(createdOccured, "dir1 created", WaitForCreationTimeoutInMs);
+                Utility.ExpectEvent(createdOccured, "dir1 created");
 
                 using (var nestedDir = new TemporaryTestDirectory(Path.Combine(firstDir.Path, "nested")))
                 {
-                    Utility.ExpectEvent(createdOccured, "nested created", WaitForCreationTimeoutInMs);
+                    Utility.ExpectEvent(createdOccured, "nested created");
 
                     action(eventOccured, nestedDir);
                 }