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

Skip flaky tests on TeamCity agents (#1832)

This commit is contained in:
Stephen Halter 2017-05-12 14:36:47 -07:00 committed by GitHub
parent 37f15bdd85
commit e149852d62
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/KeepAliveTimeoutTests.cs
View File

@ -9,7 +9,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.Http.Features;
using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure; using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Infrastructure;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Xunit; using Microsoft.AspNetCore.Testing.xunit;
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
@ -19,7 +19,10 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
private static readonly TimeSpan LongDelay = TimeSpan.FromSeconds(30); private static readonly TimeSpan LongDelay = TimeSpan.FromSeconds(30);
private static readonly TimeSpan ShortDelay = TimeSpan.FromSeconds(LongDelay.TotalSeconds / 10); private static readonly TimeSpan ShortDelay = TimeSpan.FromSeconds(LongDelay.TotalSeconds / 10);
[Fact] // This test is particularly flaky on some teamcity agents, so skip there for now.
// https://github.com/aspnet/KestrelHttpServer/issues/1684
[ConditionalFact]
[EnvironmentVariableSkipCondition("TEAMCITY_VERSION", null)]
public Task TestKeepAliveTimeout() public Task TestKeepAliveTimeout()
{ {
// Delays in these tests cannot be much longer than expected. // Delays in these tests cannot be much longer than expected.

6
test/Microsoft.AspNetCore.Server.Kestrel.FunctionalTests/LoggingConnectionAdapterTests.cs
View File

@ -8,13 +8,17 @@ using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Testing; using Microsoft.AspNetCore.Testing;
using Microsoft.AspNetCore.Testing.xunit;
using Xunit; using Xunit;
namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{ {
public class LoggingConnectionAdapterTests public class LoggingConnectionAdapterTests
{ {
[Fact] // This test is particularly flaky on some teamcity agents, so skip there for now.
// https://github.com/aspnet/KestrelHttpServer/issues/1697
[ConditionalFact]
[EnvironmentVariableSkipCondition("TEAMCITY_VERSION", null)]
public async Task LoggingConnectionAdapterCanBeAddedBeforeAndAfterHttpsAdapter() public async Task LoggingConnectionAdapterCanBeAddedBeforeAndAfterHttpsAdapter()
{ {
var host = new WebHostBuilder() var host = new WebHostBuilder()