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

Re-enable IISIntegration tests (#4377)

This commit is contained in:
Pavel Krymets 2018-12-05 08:24:12 -08:00 committed by GitHub
parent 5c1fbe1af7
commit 2e56f056d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Hosting/Server.IntegrationTesting/src/ApplicationPublisher.cs
View File

@ -43,6 +43,11 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
{ {
parameters += $" --runtime {GetRuntimeIdentifier(deploymentParameters)}"; parameters += $" --runtime {GetRuntimeIdentifier(deploymentParameters)}";
} }
else
{
// Workaround for https://github.com/aspnet/websdk/issues/422
parameters += " -p:UseAppHost=false";
}
parameters += $" {deploymentParameters.AdditionalPublishParameters}"; parameters += $" {deploymentParameters.AdditionalPublishParameters}";

1
src/IISIntegration/build/repo.props
View File

@ -14,7 +14,6 @@
<ExcludeFromTest Include="$(RepositoryRoot)test\TestSites\*.csproj" /> <ExcludeFromTest Include="$(RepositoryRoot)test\TestSites\*.csproj" />
<ExcludeFromTest Include="$(RepositoryRoot)test\IISTestSite\*.csproj" /> <ExcludeFromTest Include="$(RepositoryRoot)test\IISTestSite\*.csproj" />
<ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" /> <ExcludeSolutions Include="$(RepositoryRoot)IISIntegration.NoV1.sln" />
<ExcludeFromTest Include="$(RepositoryRoot)test\**\*.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup Condition="'$(SkipIISTests)' == 'true'" > <ItemGroup Condition="'$(SkipIISTests)' == 'true'" >

2
src/IISIntegration/test/Common.FunctionalTests/Inprocess/StartupTests.cs
View File

@ -121,7 +121,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
await StartAsync(deploymentParameters); await StartAsync(deploymentParameters);
} }
[ConditionalFact] [ConditionalFact(Skip="https://github.com/aspnet/AspNetCore/issues/3950")]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)] [RequiresIIS(IISCapability.PoolEnvironmentVariables)]
public async Task StartsWithPortableAndBootstraperExe() public async Task StartsWithPortableAndBootstraperExe()
{ {