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

Fix win7 test failures. (#1109)

This commit is contained in:
Justin Kotalik 2018-07-27 17:32:01 -07:00 committed by GitHub
parent c6ba21efc1
commit 0af3bef0fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS/IISApplication.cs
View File

@ -99,7 +99,7 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
_logger.LogInformation($"Tried to start site, state: {state.ToString()}"); _logger.LogInformation($"Tried to start site, state: {state.ToString()}");
} }
} }
catch (COMException comException) catch (Exception ex) when (ex is DllNotFoundException || (ex is COMException && (uint)ex.HResult == 0x800710D8) )
{ {
// Accessing the site.State property while the site // Accessing the site.State property while the site
// is starting up returns the COMException // is starting up returns the COMException
@ -107,7 +107,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
// (Exception from HRESULT: 0x800710D8) // (Exception from HRESULT: 0x800710D8)
// This also means the site is not started yet, so catch and retry // This also means the site is not started yet, so catch and retry
// after waiting. // after waiting.
_logger.LogWarning($"ComException: {comException.Message}");
} }
await Task.Delay(_retryDelay); await Task.Delay(_retryDelay);

1
test/Common.FunctionalTests/AppHostConfig/IIS.config
View File

@ -68,7 +68,6 @@
<section name="httpTracing" overrideModeDefault="Deny" /> <section name="httpTracing" overrideModeDefault="Deny" />
<section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" /> <section name="isapiFilters" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
<section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" /> <section name="modules" allowDefinition="MachineToApplication" overrideModeDefault="Deny" />
<section name="applicationInitialization" allowDefinition="MachineToApplication" overrideModeDefault="Allow" />
<section name="odbcLogging" overrideModeDefault="Deny" /> <section name="odbcLogging" overrideModeDefault="Deny" />
<sectionGroup name="security"> <sectionGroup name="security">
<section name="access" overrideModeDefault="Deny" /> <section name="access" overrideModeDefault="Deny" />

1
test/IIS.FunctionalTests/Properties/AssemblyInfo.cs
View File

@ -7,5 +7,4 @@ using Xunit;
[assembly: CollectionBehavior(DisableTestParallelization = true)] [assembly: CollectionBehavior(DisableTestParallelization = true)]
[assembly: RequiresIIS] [assembly: RequiresIIS]
[assembly: OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, SkipReason = "https://github.com/aspnet/IISIntegration/issues/1069")]