[tests] Fix more System.ServiceModel flakiness

3 files changed, 36 insertions, 18 deletions

diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
index 22110a5d519..71c1f554c3b 100644
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug32886Test.cs
@@ -68,9 +68,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				string result = null;
 
 				client.CelsiusToFahrenheitCompleted += delegate (object o, CelsiusToFahrenheitCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 
 				client.CelsiusToFahrenheitAsync ("24.5");
diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
index 7ecaee844d6..141d8bf3f6b 100644
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331Test.cs
@@ -71,9 +71,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				object result = null;
 
 				client.GetDataCompleted += delegate (object o, GetDataCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 
 				client.GetDataAsync ();
diff --git a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
index bd3252b7cdc..21559c528a2 100644
--- a/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
+++ b/mcs/class/System.ServiceModel/Test/System.ServiceModel.Dispatcher/Bug652331_2Test.cs
@@ -82,9 +82,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				object result = null;
 
 				normalClient.GetDataCompleted += delegate (object o, GetDataCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 				normalClient.GetDataAsync ();
 
@@ -99,9 +102,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				ObservableCollection<object> result = null;
 
 				collectionClient.GetCollectionDataCompleted += delegate (object sender, GetCollectionDataCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 				collectionClient.GetCollectionDataAsync ();
 
@@ -116,9 +122,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				WebServiceMoonlightTest.ServiceReference2.DataType2 result = null;
 
 				nestedClient.GetNestedDataCompleted += delegate (object sender, GetNestedDataCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 				nestedClient.GetNestedDataAsync ();
 
@@ -133,9 +142,12 @@ namespace MonoTests.System.ServiceModel.Dispatcher
 				string result = null;
 
 				dbClient.JSMGetDatabasesCompleted += delegate (object sender, JSMGetDatabasesCompletedEventArgs e) {
-					error = e.Error;
-					result = e.Result;
-					wait.Set ();
+					try {
+						error = e.Error;
+						result = e.Error == null ? e.Result : null;
+					} finally {
+						wait.Set ();
+					}
 				};
 				dbClient.JSMGetDatabasesAsync();