From 4f7e4cffe6bac2790b9df4e3a15a989611f27790 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 24 May 2016 16:19:10 -0700 Subject: [PATCH] Reenable tests and remove kerberos tests #187 --- .../HttpsTest.cs | 6 +++--- .../NtlmAuthentationTest.cs | 18 ------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs index dcc9cd1057..9979d7dc1f 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/HttpsTest.cs @@ -21,7 +21,7 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x86, "https://localhost:44395/", ApplicationType.Standalone)] - //[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44396/", ApplicationType.Standalone)] + [InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x64, "https://localhost:44396/", ApplicationType.Standalone)] public Task Https_HelloWorld(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { return HttpsHelloWorld(ServerType.IISExpress, runtimeFlavor, architecture, applicationBaseUrl, applicationType); @@ -81,8 +81,8 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests [ConditionalTheory] [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)] - //[InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)] + [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44397/", ApplicationType.Standalone)] + [InlineData(RuntimeFlavor.CoreClr, RuntimeArchitecture.x64, "https://localhost:44398/", ApplicationType.Portable)] //[InlineData(RuntimeFlavor.Clr, RuntimeArchitecture.x86, "https://localhost:44399/", ApplicationType.Standalone)] public Task Https_HelloWorld_NoClientCert(RuntimeFlavor runtimeFlavor, RuntimeArchitecture architecture, string applicationBaseUrl, ApplicationType applicationType) { diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs index 3c6ad826dc..93fd988a93 100644 --- a/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs +++ b/test/Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests/NtlmAuthentationTest.cs @@ -96,24 +96,6 @@ namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests response = await httpClient.GetAsync("/AutoForbid"); responseText = await response.Content.ReadAsStringAsync(); Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); - - response = await httpClient.GetAsync("/Restricted"); - responseText = await response.Content.ReadAsStringAsync(); - Assert.Equal("Kerberos", responseText); - - response = await httpClient.GetAsync("/RestrictedNegotiate"); - responseText = await response.Content.ReadAsStringAsync(); - // This is Forbidden because we authenticate with Kerberos and challenge for Negotiate. - // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves, - // so both Negotiate and NTLM get sent again. - Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); - - response = await httpClient.GetAsync("/RestrictedNTLM"); - responseText = await response.Content.ReadAsStringAsync(); - // This is Forbidden because we authenticate with Kerberos and challenge for NTLM. - // Note we can't restrict a challenge to a specific auth type, the native auth modules always add themselves, - // so both Negotiate and NTLM get sent again. - Assert.Equal(HttpStatusCode.Forbidden, response.StatusCode); } catch (XunitException) {