Skip to content
This repository was archived by the owner on Nov 20, 2018. It is now read-only.

Attempt to fix race conditions in RunsWithIterationEnvVariable #469

Merged
merged 2 commits into from
Jul 30, 2018
Merged

Attempt to fix race conditions in RunsWithIterationEnvVariable #469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5320761
Attempt to fix race conditions in RunsWithIterationEnvVariable
Jul 30, 2018
d9c744d
Attempt to make RestartProcessThatTerminatesAfterFileChange more reli…
Jul 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions test/dotnet-watch.FunctionalTests/DotNetWatcherTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,25 @@ public async Task RunsWithIterationEnvVariable()
var source = Path.Combine(_app.SourceDirectory, "Program.cs");
var contents = File.ReadAllText(source);
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 count = int.Parse(message.Substring(messagePrefix.Length), CultureInfo.InvariantCulture);
Assert.Equal(i, count);

File.Delete(source);
File.WriteAllText(source, contents);
await _app.HasRestarted();
await _app.IsWaitingForFileChange();

try
{
File.SetLastWriteTime(source, DateTime.Now);
await _app.HasRestarted();
}
catch
{
// retry
File.SetLastWriteTime(source, DateTime.Now);
await _app.HasRestarted();
}
}
}

Expand Down
15 changes: 12 additions & 3 deletions test/dotnet-watch.FunctionalTests/NoDepsAppTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,19 @@ public async Task RestartProcessThatTerminatesAfterFileChange()
await _app.IsWaitingForFileChange();

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();
Assert.NotEqual(pid, pid2);
await _app.HasExited(); // process should exit after run
Expand Down