huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #436 from aspnet/mkArtakMSFT-patch-1 

Added using block around a disposable type usage
This commit is contained in:
Artak 2018-05-09 14:25:28 -07:00 committed by GitHub
parent 07517187b6 ddc478ab87
commit 6eb4da3826
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
test/dotnet-watch.FunctionalTests/FileWatcherTests.cs
View File

@ -304,42 +304,44 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
private void AssertFileChangeRaisesEvent(string directory, IFileSystemWatcher watcher) private void AssertFileChangeRaisesEvent(string directory, IFileSystemWatcher watcher)
{ {
var semaphoreSlim = new SemaphoreSlim(0); using (var semaphoreSlim = new SemaphoreSlim(0))
var expectedPath = Path.Combine(directory, Path.GetRandomFileName());
EventHandler<string> handler = (object _, string f) =>
{ {
_output.WriteLine("File changed: " + f); var expectedPath = Path.Combine(directory, Path.GetRandomFileName());
EventHandler<string> handler = (object _, string f) =>
{
_output.WriteLine("File changed: " + f);
try
{
if (string.Equals(f, expectedPath, StringComparison.OrdinalIgnoreCase))
{
semaphoreSlim.Release();
}
}
catch (ObjectDisposedException)
{
// There's a known race condition here:
// even though we tell the watcher to stop raising events and we unsubscribe the handler
// there might be in-flight events that will still process. Since we dispose the reset
// event, this code will fail if the handler executes after Dispose happens.
}
};
File.AppendAllText(expectedPath, " ");
watcher.OnFileChange += handler;
try try
{ {
if (string.Equals(f, expectedPath, StringComparison.OrdinalIgnoreCase)) // On Unix the file write time is in 1s increments;
{ // if we don't wait, there's a chance that the polling
semaphoreSlim.Release(); // watcher will not detect the change
} Thread.Sleep(1000);
File.AppendAllText(expectedPath, " ");
Assert.True(semaphoreSlim.Wait(DefaultTimeout), "Expected a file change event for " + expectedPath);
} }
catch (ObjectDisposedException) finally
{ {
// There's a known race condition here: watcher.OnFileChange -= handler;
// even though we tell the watcher to stop raising events and we unsubscribe the handler
// there might be in-flight events that will still process. Since we dispose the reset
// event, this code will fail if the handler executes after Dispose happens.
} }
};
File.AppendAllText(expectedPath, " ");
watcher.OnFileChange += handler;
try
{
// On Unix the file write time is in 1s increments;
// if we don't wait, there's a chance that the polling
// watcher will not detect the change
Thread.Sleep(1000);
File.AppendAllText(expectedPath, " ");
Assert.True(semaphoreSlim.Wait(DefaultTimeout), "Expected a file change event for " + expectedPath);
}
finally
{
watcher.OnFileChange -= handler;
} }
} }