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

Make RestartProcessThatTerminatesAfterFileChange more reliable

This commit is contained in:
Victor Hurdugaci 2016-05-25 11:48:20 -07:00
parent f154a9ee3e
commit 8ab32c44f7
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/NoDepsAppTests.cs
View File

@ -4,6 +4,7 @@
using System; using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading;
using Xunit; using Xunit;
namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
@ -79,6 +80,11 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
// Then wait for it to restart when we change a file // Then wait for it to restart when we change a file
using (var wait = new WaitForFileToChange(scenario.StartedFile)) using (var wait = new WaitForFileToChange(scenario.StartedFile))
{ {
// 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);
var fileToChange = Path.Combine(scenario.TestAppFolder, "Program.cs"); var fileToChange = Path.Combine(scenario.TestAppFolder, "Program.cs");
var programCs = File.ReadAllText(fileToChange); var programCs = File.ReadAllText(fileToChange);
File.WriteAllText(fileToChange, programCs); File.WriteAllText(fileToChange, programCs);

10
test/Microsoft.DotNet.Watcher.Tools.FunctionalTests/Waiters.cs
View File

@ -44,6 +44,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
public static void WaitForProcessToStop(int processId, TimeSpan timeout, bool expectedToStop, string errorMessage) public static void WaitForProcessToStop(int processId, TimeSpan timeout, bool expectedToStop, string errorMessage)
{ {
Console.WriteLine($"Waiting for process {processId} to stop...");
Process process = null; Process process = null;
try try
@ -52,8 +54,11 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
} }
catch (Exception e) catch (Exception e)
{ {
Console.WriteLine("Could not get process id:"); // If we expect the process to stop, then it might have stopped already
Console.WriteLine(e); if (!expectedToStop)
{
Console.WriteLine($"Could not find process {processId}: {e}");
}
} }
var watch = new Stopwatch(); var watch = new Stopwatch();
@ -62,6 +67,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
{ {
if (process == null || process.HasExited) if (process == null || process.HasExited)
{ {
Console.WriteLine($"Process {processId} is no longer running");
break; break;
} }
Thread.Sleep(500); Thread.Sleep(500);