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

Re-Enable ANCM OutOfProcess tests (#678)

This commit is contained in:
Justin Kotalik 2018-03-16 12:10:19 -07:00 committed by GitHub
parent 573e60f007
commit b0ec797681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
View File

@ -2,7 +2,6 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
#if NETCOREAPP2_0 || NETCOREAPP2_1
using System;
using System.IO;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Server.IntegrationTesting;
@ -20,13 +19,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
public Task HelloWorld_IISExpress_Clr_X64_Portable()
{
return HelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable);
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact]
public Task HelloWorld_IISExpress_CoreClr_X64_Portable()
{
return HelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable);
@ -59,7 +58,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory))
{
var deploymentResult = await deployer.DeployAsync();
deploymentResult.HttpClient.Timeout = TimeSpan.FromSeconds(5);
// Request to base address and check if various parts of the body are rendered & measure the cold startup time.
var response = await RetryHelper.RetryRequest(() =>
@ -86,7 +84,10 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
response = await deploymentResult.HttpClient.GetAsync("/Auth");
responseText = await response.Content.ReadAsStringAsync();
Assert.True("backcompat;Windows".Equals(responseText) || "latest;null".Equals(responseText), "Auth");
// We adapted the Http.config file to be used for inprocess too. We specify WindowsAuth is enabled
// We now expect that windows auth is enabled rather than disabled.
Assert.True("backcompat;Windows".Equals(responseText) || "latest;Windows".Equals(responseText), "Auth");
}
catch (XunitException)
{

10
test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
View File

@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact(Skip = "Full framework web.config generation is currently incorrect. See: https://github.com/aspnet/websdk/pull/322")]
public Task Https_HelloWorld_CLR_X64()
{
return HttpsHelloWorld(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44396);
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact]
public Task Https_HelloWorld_CoreCLR_X64_Portable()
{
return HttpsHelloWorld(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 44394);
@ -93,13 +93,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
}
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact]
public Task Https_HelloWorld_NoClientCert_CoreCLR_X64_Portable()
{
return HttpsHelloWorldCerts(RuntimeFlavor.CoreClr, ApplicationType.Portable , port: 44397, sendClientCert: false);
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
public Task Https_HelloWorld_NoClientCert_Clr_X64()
{
return HttpsHelloWorldCerts(RuntimeFlavor.Clr, ApplicationType.Portable, port: 44398, sendClientCert: false);
@ -135,7 +135,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
ApplicationBaseUriHint = applicationBaseUrl,
EnvironmentName = "HttpsHelloWorld", // Will pick the Start class named 'StartupHttpsHelloWorld',
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("Https.config") : null,
ServerConfigTemplateContent = (serverType == ServerType.IISExpress) ? File.ReadAllText("AppHostConfig/Https.config") : null,
SiteName = "HttpsTestSite", // This is configured in the Https.config
TargetFramework = runtimeFlavor == RuntimeFlavor.Clr ? "net461" : "netcoreapp2.0",
ApplicationType = applicationType,

4
test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
View File

@ -25,13 +25,13 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
{
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact(Skip = "Full framework web.config generation is currently incorrect. See https://github.com/aspnet/websdk/pull/322")]
public Task NtlmAuthentication_Clr_X64()
{
return NtlmAuthentication(RuntimeFlavor.Clr, ApplicationType.Portable, port: 5051);
}
[Fact(Skip = "See https://github.com/aspnet/IISIntegration/issues/498")]
[Fact]
public Task NtlmAuthentication_CoreClr_X64_Portable()
{
return NtlmAuthentication(RuntimeFlavor.CoreClr, ApplicationType.Portable, port: 5052);