From 2eef8fdff2d510960b7291937bc26f9ea5ee8fba Mon Sep 17 00:00:00 2001 From: Arthur Vickers Date: Fri, 2 Feb 2018 09:35:00 -0800 Subject: [PATCH] Add retries to help with test flakiness Issue #2844 --- .../DatabaseErrorPageMiddlewareTest.cs | 8 +++++--- .../SqlServerTestStore.cs | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs index 81fe905859..bc9764c339 100644 --- a/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs +++ b/test/Diagnostics.EFCore.FunctionalTests/DatabaseErrorPageMiddlewareTest.cs @@ -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.MacOSX)] 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()); if (!PlatformHelper.IsMono) { - optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600)); + optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600).EnableRetryOnFailure()); } else { @@ -498,7 +498,9 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests { if (!PlatformHelper.IsMono) { - optionsBuilder.UseSqlServer(database.ConnectionString, b => b.CommandTimeout(600)); + optionsBuilder.UseSqlServer( + database.ConnectionString, + b => b.CommandTimeout(600).EnableRetryOnFailure()); } else { diff --git a/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs b/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs index 4a60fa40a0..cfdfcf8d07 100644 --- a/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs +++ b/test/Diagnostics.EFCore.FunctionalTests/SqlServerTestStore.cs @@ -43,7 +43,7 @@ namespace Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore.Tests if (!PlatformHelper.IsMono) { 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)) {