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

Add retries to help with test flakiness 

Issue #2844
This commit is contained in:
Arthur Vickers 2018-02-02 09:35:00 -08:00
parent d44b78e842
commit 2eef8fdff2
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs
View File

@ -143,7 +143,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
} }
} }
[ConditionalFact(Skip="https://github.com/aspnet/Home/issues/2844")] [ConditionalFact]
[OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.Linux)]
[OSSkipCondition(OperatingSystems.MacOSX)] [OSSkipCondition(OperatingSystems.MacOSX)]
public void No_exception_on_diagnostic_event_received_when_null_state() public void No_exception_on_diagnostic_event_received_when_null_state()
@ -380,7 +380,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
.UseLoggerFactory(context.RequestServices.GetService<ILoggerFactory>()); .UseLoggerFactory(context.RequestServices.GetService<ILoggerFactory>());
if (!PlatformHelper.IsMono) if (!PlatformHelper.IsMono)
{ {
optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600)); optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600).EnableRetryOnFailure());
} }
else else
{ {
@ -498,7 +498,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
{ {
if (!PlatformHelper.IsMono) if (!PlatformHelper.IsMono)
{ {
optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600)); optionsBuilder.UseSqlServer(
database.ConnectionString,
b => b.CommandTimeout(600).EnableRetryOnFailure());
} }
else else
{ {

2
test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests
if (!PlatformHelper.IsMono) if (!PlatformHelper.IsMono)
{ {
var optionsBuilder = new DbContextOptionsBuilder(); var optionsBuilder = new DbContextOptionsBuilder();
optionsBuilder.UseSqlServer(_connectionString, b => b.CommandTimeout(600)); optionsBuilder.UseSqlServer(_connectionString, b => b.CommandTimeout(600).EnableRetryOnFailure());
using (var db = new DbContext(optionsBuilder.Options)) using (var db = new DbContext(optionsBuilder.Options))
{ {