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

Merge branch 'release/2.2'

This commit is contained in:
Nate McMaster 2018-07-30 15:57:46 -07:00
parent d9fd86b754 4baed363e5
commit fca90fe6be
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/dotnet-watch.FunctionalTests/DotNetWatcherTests.cs
View File

@ -39,15 +39,25 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
var source = Path.Combine(_app.SourceDirectory, "Program.cs"); var source = Path.Combine(_app.SourceDirectory, "Program.cs");
var contents = File.ReadAllText(source); var contents = File.ReadAllText(source);
const string messagePrefix = "DOTNET_WATCH_ITERATION = "; const string messagePrefix = "DOTNET_WATCH_ITERATION = ";
for (var i = 1; i <= 4; i++) for (var i = 1; i <= 3; i++)
{ {
var message = await _app.Process.GetOutputLineStartsWithAsync(messagePrefix, TimeSpan.FromMinutes(2)); var message = await _app.Process.GetOutputLineStartsWithAsync(messagePrefix, TimeSpan.FromMinutes(2));
var count = int.Parse(message.Substring(messagePrefix.Length), CultureInfo.InvariantCulture); var count = int.Parse(message.Substring(messagePrefix.Length), CultureInfo.InvariantCulture);
Assert.Equal(i, count); Assert.Equal(i, count);
File.Delete(source); await _app.IsWaitingForFileChange();
File.WriteAllText(source, contents);
await _app.HasRestarted(); try
{
File.SetLastWriteTime(source, DateTime.Now);
await _app.HasRestarted();
}
catch
{
// retry
File.SetLastWriteTime(source, DateTime.Now);
await _app.HasRestarted();
}
} }
} }

15
test/dotnet-watch.FunctionalTests/NoDepsAppTests.cs
View File

@ -53,10 +53,19 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
await _app.IsWaitingForFileChange(); await _app.IsWaitingForFileChange();
var fileToChange = Path.Combine(_app.SourceDirectory, "Program.cs"); var fileToChange = Path.Combine(_app.SourceDirectory, "Program.cs");
var programCs = File.ReadAllText(fileToChange);
File.WriteAllText(fileToChange, programCs);
await _app.HasRestarted(); try
{
File.SetLastWriteTime(fileToChange, DateTime.Now);
await _app.HasRestarted();
}
catch
{
// retry
File.SetLastWriteTime(fileToChange, DateTime.Now);
await _app.HasRestarted();
}
var pid2 = await _app.GetProcessId(); var pid2 = await _app.GetProcessId();
Assert.NotEqual(pid, pid2); Assert.NotEqual(pid, pid2);
await _app.HasExited(); // process should exit after run await _app.HasExited(); // process should exit after run