Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 27, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3e62e64
Re-enable full IIS tests on Windows.10.Amd64.EnterpriseRS3.ASPNET.Open
pakrym Feb 25, 2019
8c4df4d
Change skip attribute
pakrym Feb 26, 2019
7d47b52
use 64bit powershell
pakrym Feb 26, 2019
2ef335a
This should work
pakrym Feb 26, 2019
c75259c
Re-disable
pakrym Feb 26, 2019
1d29d2c
Merge remote-tracking branch 'origin/master' into pakrym/re-enable-fu…
pakrym Feb 27, 2019
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: 12 additions & 6 deletions eng/helix/vstest/runtests.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 6 additions & 1 deletion eng/scripts/RunPowershell.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 7 additions & 0 deletions eng/targets/Helix.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
<Project>
<ItemDefinitionGroup>
<HelixAvailibleTargetQueue>
<EnableByDefault>true</EnableByDefault>
</HelixAvailibleTargetQueue>
</ItemDefinitionGroup>

<!-- this file is shared between Helix.proj and .csproj files -->
<ItemGroup>
<HelixAvailblePlatform Include="Windows" />
<HelixAvailblePlatform Include="OSX" />
<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" />
Expand Down
9 changes: 7 additions & 2 deletions eng/targets/Helix.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 2 additions & 6 deletions src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ public StartupTests(PublishedSitesFixture fixture)

private readonly string _dotnetLocation = DotNetCommands.GetDotNetExecutable(RuntimeArchitecture.x64);

[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalFact]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
public async Task ExpandEnvironmentVariableInWebConfig()
Expand Down Expand Up @@ -68,7 +67,6 @@ public async Task InvalidProcessPath_ExpectServerError(string path, string argum
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()
{
Expand All @@ -80,7 +78,6 @@ public async Task StartsWithDotnetLocationWithoutExe()
await StartAsync(deploymentParameters);
}

[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalFact]
public async Task StartsWithDotnetLocationUppercase()
{
Expand All @@ -92,7 +89,6 @@ public async Task StartsWithDotnetLocationUppercase()
await StartAsync(deploymentParameters);
}

[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[ConditionalTheory]
[InlineData("dotnet")]
[InlineData("dotnet.EXE")]
Expand All @@ -113,7 +109,7 @@ public async Task StartsWithDotnetOnThePath(string path)
}


[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/6549
[SkipOnHelix] // https://github.com/aspnet/AspNetCore/issues/7972
[ConditionalTheory]
[InlineData(RuntimeArchitecture.x64)]
[InlineData(RuntimeArchitecture.x86)]
Expand Down Expand Up @@ -190,7 +186,7 @@ public async Task HelloWorld(TestVariant variant)
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()
Expand Down
6 changes: 6 additions & 0 deletions src/Servers/IIS/IIS/test/FunctionalTest.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
5 changes: 3 additions & 2 deletions ....BackwardsCompatibility.FunctionalTests/IIS.BackwardsCompatibility.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
5 changes: 3 additions & 2 deletions ...IS.ForwardsCompatibility.FunctionalTests/IIS.ForwardsCompatibility.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
4 changes: 3 additions & 1 deletion src/Servers/IIS/IIS/test/IIS.FunctionalTests/IIS.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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" />
Expand Down
1 change: 1 addition & 0 deletions src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/MofFileTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ public class MofFileTests
[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");
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.Shared.FunctionalTests/RequiresIISAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ static RequiresIISAttribute()
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)
{
Expand Down