From e9765a1b9dc6297f9c817371b0db0d0fb414f5f3 Mon Sep 17 00:00:00 2001 From: Greg Bielleman Date: Tue, 8 Mar 2016 18:37:58 +1100 Subject: [PATCH 1/5] Update NServiceBus SQL to 2.2.2 -Closes #689 --- .../ServiceControlInstaller.Packaging.csproj | 2 +- src/ServicControlInstaller.Packaging/packages.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj index d88be47ae5..c377759cd4 100644 --- a/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj +++ b/src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj @@ -81,7 +81,7 @@ True - ..\packages\NServiceBus.SqlServer.2.2.1\lib\net45\NServiceBus.Transports.SQLServer.dll + ..\packages\NServiceBus.SqlServer.2.2.2\lib\net45\NServiceBus.Transports.SQLServer.dll True diff --git a/src/ServicControlInstaller.Packaging/packages.config b/src/ServicControlInstaller.Packaging/packages.config index 06d3a09467..ce1bbe7c5c 100644 --- a/src/ServicControlInstaller.Packaging/packages.config +++ b/src/ServicControlInstaller.Packaging/packages.config @@ -10,7 +10,7 @@ - + From 00959e2a4064813cfb2970b29ef179bbc4560f53 Mon Sep 17 00:00:00 2001 From: Greg Bielleman Date: Tue, 8 Mar 2016 18:47:18 +1100 Subject: [PATCH 2/5] Update NServiceBus,SqlServer in Acceptance Tests --- src/ServiceControl.AcceptanceTests/packages.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceControl.AcceptanceTests/packages.config b/src/ServiceControl.AcceptanceTests/packages.config index ad4fa90fb0..78d901fdf1 100644 --- a/src/ServiceControl.AcceptanceTests/packages.config +++ b/src/ServiceControl.AcceptanceTests/packages.config @@ -15,7 +15,7 @@ - + From dc59edf7bfc76c0c1a2875d21267e3953f600d2f Mon Sep 17 00:00:00 2001 From: Greg Bielleman Date: Tue, 8 Mar 2016 18:48:03 +1100 Subject: [PATCH 3/5] Fix AT csproj --- .../ServiceControl.AcceptanceTests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj index 86dda76fb0..298cdaf010 100644 --- a/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj +++ b/src/ServiceControl.AcceptanceTests/ServiceControl.AcceptanceTests.csproj @@ -105,7 +105,7 @@ True - ..\packages\NServiceBus.SqlServer.2.2.1\lib\net45\NServiceBus.Transports.SQLServer.dll + ..\packages\NServiceBus.SqlServer.2.2.2\lib\net45\NServiceBus.Transports.SQLServer.dll True From ce1d7b40207a24d77835c08aeb80f9ff59bfd091 Mon Sep 17 00:00:00 2001 From: John Simons Date: Wed, 9 Mar 2016 15:37:23 +1000 Subject: [PATCH 4/5] Fixing problematic AT --- .../When_a_retry_for_a_empty_body_message_is_successful.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs index 29d7adfd5d..fac1c9517a 100644 --- a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs +++ b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_retry_for_a_empty_body_message_is_successful.cs @@ -45,7 +45,9 @@ public void Should_show_up_as_resolved_when_doing_a_single_retry() bool GetFailedMessage(MyContext c, out FailedMessage failure, Predicate condition = null) { - if (!TryGet("/api/errors/" + c.UniqueMessageId, out failure, condition)) + failure = null; + + if (String.IsNullOrEmpty(c.UniqueMessageId) || !TryGet("/api/errors/" + c.UniqueMessageId, out failure, condition)) { return false; } From e6f42b7b418034a03ee7193be69ab5dc47cc6a1f Mon Sep 17 00:00:00 2001 From: John Simons Date: Thu, 10 Mar 2016 10:25:21 +1000 Subject: [PATCH 5/5] Improving ATs --- ...ustom_check_transition_should_trigger_signalr_event.cs | 2 ++ .../CustomChecks/When_a_periodic_custom_check_fails.cs | 8 +++++++- .../MessageFailures/When_a_message_has_failed.cs | 3 +++ .../When_signalr_receives_a_message.cs | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ServiceControl.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs b/src/ServiceControl.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs index 890890466f..5df6c80720 100644 --- a/src/ServiceControl.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs +++ b/src/ServiceControl.AcceptanceTests/CustomChecks/Custom_check_transition_should_trigger_signalr_event.cs @@ -86,6 +86,8 @@ public void Start() { break; } + + Thread.Sleep(TimeSpan.FromSeconds(1)); } } } diff --git a/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs b/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs index 58cac74791..ae85076021 100644 --- a/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs +++ b/src/ServiceControl.AcceptanceTests/CustomChecks/When_a_periodic_custom_check_fails.cs @@ -3,6 +3,7 @@ using System; using System.Linq; using System.Net; + using System.Threading; using Contexts; using Microsoft.AspNet.SignalR.Client; using NServiceBus; @@ -88,12 +89,15 @@ public void Start() { try { + context.AddTrace("Connecting to signalr"); connection.Start().Wait(); - + context.AddTrace("Connected to signalr"); break; } catch (AggregateException ex) { + context.AddTrace(string.Format("Signalr connection failed, exception={0}", ex)); + var exception = ex.GetBaseException(); var webException = exception as WebException; @@ -106,6 +110,8 @@ public void Start() { break; } + + Thread.Sleep(TimeSpan.FromSeconds(1)); } } } diff --git a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs index 12faae0f48..c278d76be1 100644 --- a/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs +++ b/src/ServiceControl.AcceptanceTests/MessageFailures/When_a_message_has_failed.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Net; using System.Text.RegularExpressions; + using System.Threading; using Contexts; using NServiceBus; using NServiceBus.AcceptanceTesting; @@ -185,6 +186,8 @@ public void Start() { break; } + + Thread.Sleep(TimeSpan.FromSeconds(1)); } } diff --git a/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs b/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs index 3de950a3d0..dcba16382f 100644 --- a/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs +++ b/src/ServiceControl.AcceptanceTests/When_signalr_receives_a_message.cs @@ -2,6 +2,7 @@ { using System; using System.Net; + using System.Threading; using Contexts; using Microsoft.AspNet.SignalR.Client; using NServiceBus; @@ -54,6 +55,8 @@ public void Should_be_imported_and_accessible_via_the_rest_api() { break; } + + Thread.Sleep(TimeSpan.FromSeconds(1)); } }