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

Resolves #444 - remove workaround for CTRL+C deadlocks

This commit is contained in:
Nate McMaster 2018-05-31 20:16:06 -07:00 committed by GitHub
parent f573ab6c82
commit e74907d6bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dotnet-watch/Program.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -121,8 +121,7 @@ namespace Microsoft.DotNet.Watcher
_reporter.Output("Shutdown requested. Press Ctrl+C again to force exit."); _reporter.Output("Shutdown requested. Press Ctrl+C again to force exit.");
} }
// Invoke the cancellation on the default thread pool to workaround https://github.com/dotnet/corefx/issues/29699 _cts.Cancel();
ThreadPool.QueueUserWorkItem(_ => _cts.Cancel());
} }
private async Task<int> MainInternalAsync( private async Task<int> MainInternalAsync(

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

@ -37,6 +37,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
{ {
await _app.StartWatcherAsync(); await _app.StartWatcherAsync();
var source = Path.Combine(_app.SourceDirectory, "Program.cs"); var source = Path.Combine(_app.SourceDirectory, "Program.cs");
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 <= 4; i++)
{ {
@ -44,7 +45,8 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
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.SetLastWriteTime(source, DateTime.Now); File.Delete(source);
File.WriteAllText(source, contents);
await _app.HasRestarted(); await _app.HasRestarted();
} }
} }

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

@ -5,8 +5,6 @@ using System;
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
using Xunit.Abstractions; using Xunit.Abstractions;
@ -25,28 +23,6 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_output = logger; _output = logger;
} }
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Windows, SkipReason = "Testing SIGINT is specific to macOS/Linux")]
public async Task KillsProcessOnSigInt()
{
void SendSigInt(int pid)
{
_output.WriteLine($"kill -SIGINT {pid}");
Process.Start("kill", $"-SIGINT {pid}");
}
await _app.StartWatcherAsync(new[] { "--no-exit" });
var childPid = await _app.GetProcessId();
SendSigInt(_app.Process.Id);
SendSigInt(childPid);
await _app.Process.Exited.TimeoutAfter(TimeSpan.FromSeconds(30));
Assert.DoesNotContain(_app.Process.Output, l => l.StartsWith("Exited with error code"));
}
[Fact] [Fact]
public async Task RestartProcessOnFileChange() public async Task RestartProcessOnFileChange()
{ {