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

Re-enable full IIS tests on Windows.10.Amd64.EnterpriseRS3.ASPNET.Open (#7959)

This commit is contained in:
Pavel Krymets 2019-02-27 11:03:41 -08:00 committed by GitHub
parent fd83f4dbb9
commit 783131a750
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 51 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eng/helix/vstest/runtests.cmd
View File

@ -1,14 +1,20 @@
set target=%1
set sdkVersion=%2
set runtimeVersion=%3
set DOTNET_ROOT=%HELIX_CORRELATION_PAYLOAD%\sdk
powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Version %sdkVersion% -InstallDir %DOTNET_ROOT%"
powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%"
set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk
set DOTNET_ROOT=%DOTNET_HOME%\x64
set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
set PATH=%DOTNET_ROOT%;%PATH%
set DOTNET_MULTILEVEL_LOOKUP=0
set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
set helix=true
%DOTNET_ROOT%\dotnet vstest %target% --logger:trx
set PATH=%DOTNET_ROOT%;%PATH%
powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Version %sdkVersion% -InstallDir %DOTNET_ROOT%"
powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture x64 -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%"
set HELIX=true
%DOTNET_ROOT%\dotnet vstest %target% --logger:trx --logger:console;verbosity=normal

7
eng/scripts/RunPowershell.cmd
View File

@ -3,4 +3,9 @@
SET _TAIL=%*
CALL SET _TAIL=%%_TAIL:*%1=%%
PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0%1' %_TAIL%; exit $LASTEXITCODE } catch { write-host $_; exit 1 }"
SET POWERSHELL=%windir%\System32\WindowsPowerShell\v1.0\powershell.exe
rem Force 64bit powershell
if /i "%PROCESSOR_ARCHITEW6432%" EQU "AMD64" SET POWERSHELL=%windir%\sysnative\WindowsPowerShell\v1.0\powershell.exe
%POWERSHELL% -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0%1' %_TAIL%; exit $LASTEXITCODE } catch { write-host $_; exit 1 }"

7
eng/targets/Helix.Common.props
View File

@ -1,4 +1,10 @@
<Project>
<ItemDefinitionGroup>
<HelixAvailibleTargetQueue>
<EnableByDefault>true</EnableByDefault>
</HelixAvailibleTargetQueue>
</ItemDefinitionGroup>
<!-- this file is shared between Helix.proj and .csproj files -->
<ItemGroup>
<HelixAvailblePlatform Include="Windows" />
@ -6,6 +12,7 @@
<HelixAvailblePlatform Include="Linux" />
<HelixAvailibleTargetQueue Include="Windows.10.Amd64.ClientRS4.VS2017.Open" Platform="Windows" />
<HelixAvailibleTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
<HelixAvailibleTargetQueue Include="OSX.1012.Amd64.Open" Platform="OSX" />
<HelixAvailibleTargetQueue Include="Ubuntu.1810.Amd64.Open" Platform="Linux" />
<HelixAvailibleTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />

9
eng/targets/Helix.targets
View File

@ -29,11 +29,16 @@
</PropertyGroup>
<ItemGroup>
<_HelixProjectTargetQueue Include="%(HelixAvailibleTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(Identity)' == '$(HelixTargetQueue)'" />
<!-- Include default queues based on platform -->
<_HelixProjectTargetQueue Include="%(HelixAvailibleTargetQueue.Identity)" Condition="'$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
<!-- Unconditionally include queues defined by project -->
<_HelixProjectTargetQueue Include="%(HelixProjectTargetQueue.Identity)" />
<_HelixApplicableTargetQueue Include="%(_HelixProjectTargetQueue.Identity)" Condition="'%(Identity)' == '$(HelixTargetQueue)'" />
</ItemGroup>
<PropertyGroup>
<BuildHelixPayload Condition="'@(_HelixProjectTargetQueue->Count())' == '0'">false</BuildHelixPayload>
<BuildHelixPayload Condition="'@(_HelixApplicableTargetQueue->Count())' == '0'">false</BuildHelixPayload>
</PropertyGroup>
</Target>

8
src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
View File

@ -31,7 +31,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64);
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalFact]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
public async Task ExpandEnvironmentVariableInWebConfig()
@ -68,7 +67,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
Assert.Contains("HTTP Error 500.0 - ANCM In-Process Handler Load Failure", await response.Content.ReadAsStringAsync());
}
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalFact]
public async Task StartsWithDotnetLocationWithoutExe()
{
@ -80,7 +78,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
await StartAsync(deploymentParameters);
}
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalFact]
public async Task StartsWithDotnetLocationUppercase()
{
@ -92,7 +89,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
await StartAsync(deploymentParameters);
}
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalTheory]
[InlineData("dotnet")]
[InlineData("dotnet.EXE")]
@ -113,7 +109,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
}
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
[ConditionalTheory]
[InlineData(RuntimeArchitecture.x64)]
[InlineData(RuntimeArchitecture.x86)]
@ -190,7 +186,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
await StartAsync(deploymentParameters);
}
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
[ConditionalFact]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
public async Task StartsWithPortableAndBootstraperExe()

6
src/Servers/IIS/IIS/test/FunctionalTest.props
View File

@ -12,11 +12,17 @@
<ItemGroup>
<HelixProjectPlatform Remove="Linux;OSX" />
<!-- Remove all default platforms for full IIS -->
<HelixProjectPlatform Condition="'$(IsIISTest)' == 'true'" Remove="@(HelixProjectPlatform)" />
<HelixProjectTargetQueue Condition="'$(IsIISTest)' == 'true'" Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" />
<HelixContent Include="..\..\..\tools\update_schema.ps1" />
<HelixContent Include="..\..\..\tools\InstallIISFeatures.ps1" />
<HelixContent Include="..\..\..\tools\UpdateIISExpressCertificate.ps1" />
<HelixContent Include="..\..\..\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
<HelixPreCommand Condition="'$(IsIISTest)' == 'true'" Include="call RunPowershell.cmd InstallIISFeatures.ps1" />
<HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1" />
<HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1" />
</ItemGroup>

5
src/Servers/IIS/IIS/test/IIS.BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
View File

@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../FunctionalTest.props" />
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TestGroupName>IISBackwardsCompatibility.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISBackwardsCompatibilityTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />
<ItemGroup>
<Compile Include="..\Common.FunctionalTests\**\*.cs" />
<Compile Include="..\IIS.Shared.FunctionalTests\**\*.cs" />

5
src/Servers/IIS/IIS/test/IIS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
View File

@ -1,14 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../FunctionalTest.props" />
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TestGroupName>IISForwardsCompatibility.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISForwardsCompatibilityTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />
<ItemGroup>
<ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
<ProjectReference Include="$(RepositoryRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />

4
src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
View File

@ -1,14 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="../FunctionalTest.props" />
<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TestGroupName>IIS.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISTests)' == 'true' ">true</SkipTests>
<IsIISTest>true</IsIISTest>
</PropertyGroup>
<Import Project="../FunctionalTest.props" />
<ItemGroup>
<ProjectReference Include="..\Common.Tests\Common.Tests.csproj" />
<ProjectReference Include="$(RepositoryRoot)src\Servers\IIS\IntegrationTesting.IIS\src\Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj" />

1
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
View File

@ -15,6 +15,7 @@ namespace IIS.FunctionalTests
[ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux | OperatingSystems.MacOSX)]
[RequiresIIS(IISCapability.TracingModule)]
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
public void CheckMofFile()
{
var path = Path.Combine(TestPathUtilities.GetSolutionRootDirectory("IISIntegration"), "aspnetcoremodulev2", "aspnetcore", "ancm.mof");

2
src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
View File

@ -59,7 +59,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
return;
}
var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema_v2.xml");
var ancmConfigPath = Path.Combine(Environment.SystemDirectory, "inetsrv", "config", "schema", "aspnetcore_schema.xml");
if (!File.Exists(ancmConfigPath) && !SkipInVSTSAttribute.RunningInVSTS)
{