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

Add more logging to a failing tests and move dumps to logs directory (#7462)

This commit is contained in:
Pavel Krymets 2019-02-11 12:14:05 -08:00 committed by GitHub
parent 476a1827f4
commit 037a5b0231
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Servers/IIS/IIS/test/IIS.Tests/ClientDisconnectTests.cs
View File

@ -7,6 +7,7 @@ using System.Threading.Tasks;
using Microsoft.AspNetCore.Connections; using Microsoft.AspNetCore.Connections;
using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Server.IntegrationTesting;
using Microsoft.AspNetCore.Testing.xunit; using Microsoft.AspNetCore.Testing.xunit;
using Microsoft.Extensions.Logging;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
@ -203,7 +204,16 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
cancellationTokenSource.Cancel(); cancellationTokenSource.Cancel();
await requestCompletedCompletionSource.Task.DefaultTimeout(); await requestCompletedCompletionSource.Task.DefaultTimeout();
} }
Assert.IsType<OperationCanceledException>(exception);
try
{
Assert.IsType<OperationCanceledException>(exception);
}
catch (Exception e)
{
Logger.LogError(e, "Unexpected exception");
throw;
}
} }
} }

2
src/Servers/IIS/tools/SetupTestEnvironment.ps1
View File

@ -8,7 +8,7 @@ Remove-Item "HKLM:\SOFTWARE\Microsoft\IIS Extensions\IIS AspNetCore Module V2\Pa
if (!($DumpFolder)) if (!($DumpFolder))
{ {
$DumpFolder = "$PSScriptRoot\..\..\..\..\artifacts\dumps" $DumpFolder = "$PSScriptRoot\..\..\..\..\artifacts\logs\dumps"
} }
if (!(Test-Path $DumpFolder)) if (!(Test-Path $DumpFolder))
{ {