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

Remove unneeded Skip conditions

This commit is contained in:
Ryan Brandenburg 2017-12-21 14:10:39 -08:00
parent d2cdf4bac0
commit 37512d8d6a
4 changed files with 33 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Microsoft.AspNetCore.Hosting.Tests/HostingEnvironmentExtensionsTests.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
{ {
var env = new HostingEnvironment(); var env = new HostingEnvironment();
env.Initialize(Path.GetFullPath("."), new WebHostOptions(){ WebRoot = "testroot" }); env.Initialize(Path.GetFullPath("."), new WebHostOptions() { WebRoot = "testroot" });
Assert.Equal(Path.GetFullPath("."), env.ContentRootPath); Assert.Equal(Path.GetFullPath("."), env.ContentRootPath);
Assert.Equal(Path.GetFullPath("testroot"), env.WebRootPath); Assert.Equal(Path.GetFullPath("testroot"), env.WebRootPath);
@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
Assert.IsAssignableFrom<PhysicalFileProvider>(env.WebRootFileProvider); Assert.IsAssignableFrom<PhysicalFileProvider>(env.WebRootFileProvider);
} }
[Fact(Skip = "Missing content publish property")] [Fact]
public void DefaultsToWwwrootSubdir() public void DefaultsToWwwrootSubdir()
{ {
var env = new HostingEnvironment(); var env = new HostingEnvironment();
@ -55,7 +55,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
var env = new HostingEnvironment(); var env = new HostingEnvironment();
env.EnvironmentName = "SomeName"; env.EnvironmentName = "SomeName";
env.Initialize(Path.GetFullPath("."), new WebHostOptions(){ Environment = "NewName" }); env.Initialize(Path.GetFullPath("."), new WebHostOptions() { Environment = "NewName" });
Assert.Equal("NewName", env.EnvironmentName); Assert.Equal("NewName", env.EnvironmentName);
} }

2
test/Microsoft.AspNetCore.Hosting.Tests/WebHostTests.cs
View File

@ -822,7 +822,7 @@ namespace Microsoft.AspNetCore.Hosting
} }
} }
[Fact(Skip = "Missing content publish property")] [Fact]
public void WebRootCanBeResolvedFromTheConfig() public void WebRootCanBeResolvedFromTheConfig()
{ {
var vals = new Dictionary<string, string> var vals = new Dictionary<string, string>

30
test/Microsoft.AspNetCore.TestHost.Tests/TestClientTests.cs
View File

@ -21,8 +21,7 @@ namespace Microsoft.AspNetCore.TestHost
{ {
public class TestClientTests public class TestClientTests
{ {
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task GetAsyncWorks() public async Task GetAsyncWorks()
{ {
// Arrange // Arrange
@ -40,8 +39,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal(expected, actual); Assert.Equal(expected, actual);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task NoTrailingSlash_NoPathBase() public async Task NoTrailingSlash_NoPathBase()
{ {
// Arrange // Arrange
@ -63,8 +61,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal(expected, actual); Assert.Equal(expected, actual);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task SingleTrailingSlash_NoPathBase() public async Task SingleTrailingSlash_NoPathBase()
{ {
// Arrange // Arrange
@ -86,8 +83,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal(expected, actual); Assert.Equal(expected, actual);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task PutAsyncWorks() public async Task PutAsyncWorks()
{ {
// Arrange // Arrange
@ -105,8 +101,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("Hello world PUT Response", await response.Content.ReadAsStringAsync()); Assert.Equal("Hello world PUT Response", await response.Content.ReadAsStringAsync());
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task PostAsyncWorks() public async Task PostAsyncWorks()
{ {
// Arrange // Arrange
@ -167,8 +162,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task WebSocketWorks() public async Task WebSocketWorks()
{ {
// Arrange // Arrange
@ -297,8 +291,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task WebSocketDisposalThrowsOnPeer() public async Task WebSocketDisposalThrowsOnPeer()
{ {
// Arrange // Arrange
@ -325,8 +318,7 @@ namespace Microsoft.AspNetCore.TestHost
clientSocket.Dispose(); clientSocket.Dispose();
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task WebSocketTinyReceiveGeneratesEndOfMessage() public async Task WebSocketTinyReceiveGeneratesEndOfMessage()
{ {
// Arrange // Arrange
@ -370,8 +362,7 @@ namespace Microsoft.AspNetCore.TestHost
clientSocket.Dispose(); clientSocket.Dispose();
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task ClientDisposalAbortsRequest() public async Task ClientDisposalAbortsRequest()
{ {
// Arrange // Arrange
@ -405,8 +396,7 @@ namespace Microsoft.AspNetCore.TestHost
var exception = await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await tcs.Task); var exception = await Assert.ThrowsAnyAsync<OperationCanceledException>(async () => await tcs.Task);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task ClientCancellationAbortsRequest() public async Task ClientCancellationAbortsRequest()
{ {
// Arrange // Arrange

55
test/Microsoft.AspNetCore.TestHost.Tests/TestServerTests.cs
View File

@ -46,7 +46,7 @@ namespace Microsoft.AspNetCore.TestHost
public async Task ServicesCanBeOverridenForTestingAsync() public async Task ServicesCanBeOverridenForTestingAsync()
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
.ConfigureServices(s => s.AddSingleton<IServiceProviderFactory<ThirdPartyContainer>,ThirdPartyContainerServiceProviderFactory>()) .ConfigureServices(s => s.AddSingleton<IServiceProviderFactory<ThirdPartyContainer>, ThirdPartyContainerServiceProviderFactory>())
.UseStartup<ThirdPartyContainerStartup>() .UseStartup<ThirdPartyContainerStartup>()
.ConfigureTestServices(services => services.AddSingleton(new SimpleService { Message = "OverridesConfigureServices" })) .ConfigureTestServices(services => services.AddSingleton(new SimpleService { Message = "OverridesConfigureServices" }))
.ConfigureTestContainer<ThirdPartyContainer>(container => container.Services.AddSingleton(new TestService { Message = "OverridesConfigureContainer" })); .ConfigureTestContainer<ThirdPartyContainer>(container => container.Services.AddSingleton(new TestService { Message = "OverridesConfigureContainer" }));
@ -66,7 +66,7 @@ namespace Microsoft.AspNetCore.TestHost
public void ConfigureContainer(ThirdPartyContainer container) => public void ConfigureContainer(ThirdPartyContainer container) =>
container.Services.AddSingleton(new TestService { Message = "ConfigureContainer" }); container.Services.AddSingleton(new TestService { Message = "ConfigureContainer" });
public void Configure(IApplicationBuilder app) => public void Configure(IApplicationBuilder app) =>
app.Use((ctx, next) => ctx.Response.WriteAsync( app.Use((ctx, next) => ctx.Response.WriteAsync(
$"{ctx.RequestServices.GetRequiredService<SimpleService>().Message}, {ctx.RequestServices.GetRequiredService<TestService>().Message}")); $"{ctx.RequestServices.GetRequiredService<SimpleService>().Message}, {ctx.RequestServices.GetRequiredService<TestService>().Message}"));
} }
@ -112,8 +112,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal(testService, server.Host.Services.GetRequiredService<TestService>()); Assert.Equal(testService, server.Host.Services.GetRequiredService<TestService>());
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task RequestServicesAutoCreated() public async Task RequestServicesAutoCreated()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -149,8 +148,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CustomServiceProviderSetsApplicationServices() public async Task CustomServiceProviderSetsApplicationServices()
{ {
var builder = new WebHostBuilder().UseStartup<CustomContainerStartup>(); var builder = new WebHostBuilder().UseStartup<CustomContainerStartup>();
@ -225,8 +223,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task ExistingRequestServicesWillNotBeReplaced() public async Task ExistingRequestServicesWillNotBeReplaced()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -247,8 +244,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("Found:True", result); Assert.Equal("Found:True", result);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanSetCustomServiceProvider() public async Task CanSetCustomServiceProvider()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -296,8 +292,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task ExistingServiceProviderFeatureWillNotBeReplaced() public async Task ExistingServiceProviderFeatureWillNotBeReplaced()
{ {
var appServices = new ServiceCollection().BuildServiceProvider(); var appServices = new ServiceCollection().BuildServiceProvider();
@ -339,8 +334,7 @@ namespace Microsoft.AspNetCore.TestHost
} }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task WillReplaceServiceProviderFeatureWithNullRequestServices() public async Task WillReplaceServiceProviderFeatureWithNullRequestServices()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -361,8 +355,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("Success", result); Assert.Equal("Success", result);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanAccessLogger() public async Task CanAccessLogger()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -379,8 +372,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("FoundLogger:True", result); Assert.Equal("FoundLogger:True", result);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanAccessHttpContext() public async Task CanAccessHttpContext()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -411,8 +403,7 @@ namespace Microsoft.AspNetCore.TestHost
public IHttpContextAccessor Accessor { get; set; } public IHttpContextAccessor Accessor { get; set; }
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanAddNewHostServices() public async Task CanAddNewHostServices()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -434,8 +425,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("HasContext:True", result); Assert.Equal("HasContext:True", result);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CreateInvokesApp() public async Task CreateInvokesApp()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -451,8 +441,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("CreateInvokesApp", result); Assert.Equal("CreateInvokesApp", result);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task DisposeStreamIgnored() public async Task DisposeStreamIgnored()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -470,8 +459,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("Response", await result.Content.ReadAsStringAsync()); Assert.Equal("Response", await result.Content.ReadAsStringAsync());
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task DisposedServerThrows() public async Task DisposedServerThrows()
{ {
var builder = new WebHostBuilder().Configure(app => var builder = new WebHostBuilder().Configure(app =>
@ -490,8 +478,7 @@ namespace Microsoft.AspNetCore.TestHost
await Assert.ThrowsAsync<ObjectDisposedException>(() => server.CreateClient().GetAsync("/")); await Assert.ThrowsAsync<ObjectDisposedException>(() => server.CreateClient().GetAsync("/"));
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CancelAborts() public async Task CancelAborts()
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
@ -509,8 +496,7 @@ namespace Microsoft.AspNetCore.TestHost
await Assert.ThrowsAsync<TaskCanceledException>(async () => { string result = await server.CreateClient().GetStringAsync("/path"); }); await Assert.ThrowsAsync<TaskCanceledException>(async () => { string result = await server.CreateClient().GetStringAsync("/path"); });
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanCreateViaStartupType() public async Task CanCreateViaStartupType()
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
@ -521,8 +507,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("FoundService:True", await result.Content.ReadAsStringAsync()); Assert.Equal("FoundService:True", await result.Content.ReadAsStringAsync());
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task CanCreateViaStartupTypeAndSpecifyEnv() public async Task CanCreateViaStartupTypeAndSpecifyEnv()
{ {
var builder = new WebHostBuilder() var builder = new WebHostBuilder()
@ -535,8 +520,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Equal("FoundFoo:False", await result.Content.ReadAsStringAsync()); Assert.Equal("FoundFoo:False", await result.Content.ReadAsStringAsync());
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task BeginEndDiagnosticAvailable() public async Task BeginEndDiagnosticAvailable()
{ {
DiagnosticListener diagnosticListener = null; DiagnosticListener diagnosticListener = null;
@ -565,8 +549,7 @@ namespace Microsoft.AspNetCore.TestHost
Assert.Null(listener.UnhandledException); Assert.Null(listener.UnhandledException);
} }
[ConditionalFact] [Fact]
[FrameworkSkipCondition(RuntimeFrameworks.Mono, SkipReason = "Hangs randomly (issue #507)")]
public async Task ExceptionDiagnosticAvailable() public async Task ExceptionDiagnosticAvailable()
{ {
DiagnosticListener diagnosticListener = null; DiagnosticListener diagnosticListener = null;