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

Fix hanging CORS test (#12006)

This commit is contained in:
Justin Kotalik 2019-07-11 08:40:55 -07:00 committed by GitHub
parent 0f02facb04
commit 143a3900fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Hosting/Server.IntegrationTesting/src/Deployers/SelfHostDeployer.cs
View File

@ -1,4 +1,4 @@
// Copyright (c) .NET Foundation. All rights reserved. // Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
@ -131,6 +131,12 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
WorkingDirectory = workingDirectory WorkingDirectory = workingDirectory
}; };
Logger.LogInformation($"Working directory {workingDirectory}");
Logger.LogInformation($"{Directory.Exists(workingDirectory)}");
Logger.LogInformation($"Filename {executableName}");
Logger.LogInformation($"{File.Exists(executableName)}");
Logger.LogInformation($"Arguments {executableArgs}");
AddEnvironmentVariablesToProcess(startInfo, DeploymentParameters.EnvironmentVariables); AddEnvironmentVariablesToProcess(startInfo, DeploymentParameters.EnvironmentVariables);
Uri actualUrl = null; Uri actualUrl = null;

11
src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.csproj
View File

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework> <TargetFramework>netcoreapp3.0</TargetFramework>
@ -16,6 +16,15 @@
<ItemGroup> <ItemGroup>
<!-- We don't need anything in this assembly, we just want to make sure it's built --> <!-- We don't need anything in this assembly, we just want to make sure it's built -->
<ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" /> <ProjectReference Include="$(RepoRoot)src\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj" />
<ProjectReference Include="..\testassets\TestOrigin\TestOrigin.csproj">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\testassets\TestDestination\TestDestination.csproj">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\testassets\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj">
<ReferenceOutputAssembly>False</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
View File

@ -28,7 +28,7 @@ namespace FunctionalTests
public ITestOutputHelper Output { get; } public ITestOutputHelper Output { get; }
[ConditionalTheory(Skip = "https://github.com/aspnet/AspNetCore/issues/11354")] [ConditionalTheory]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Disabling this test on OSX until we have a resolution for https://github.com/aspnet/AspNetCore-Internal/issues/1619")] [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Disabling this test on OSX until we have a resolution for https://github.com/aspnet/AspNetCore-Internal/issues/1619")]
[InlineData("Startup")] [InlineData("Startup")]
[InlineData("StartupWithoutEndpointRouting")] [InlineData("StartupWithoutEndpointRouting")]
@ -98,7 +98,7 @@ namespace FunctionalTests
var originDeployment = await originFactory.DeployAsync(); var originDeployment = await originFactory.DeployAsync();
var secondOriginFactory = ApplicationDeployerFactory.Create(originParameters, loggerFactory); var secondOriginFactory = ApplicationDeployerFactory.Create(originParameters, loggerFactory);
var secondOriginDeployment = await originFactory.DeployAsync(); var secondOriginDeployment = await secondOriginFactory.DeployAsync();
var port = originDeployment.HttpClient.BaseAddress.Port; var port = originDeployment.HttpClient.BaseAddress.Port;
var destinationParameters = new DeploymentParameters var destinationParameters = new DeploymentParameters