[Microsoft.Build] Improve assert in BuildSubmissionTest.EndBuildWaitsForSubmissionCompletion

It started failing more frequently, let's see if we can get better data.
Also did the same change to a similar test.

2 files changed, 12 insertions, 12 deletions

diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildManagerTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildManagerTest.cs
index cdf6e9f2c32..2d42371476d 100644
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildManagerTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildManagerTest.cs
@@ -150,18 +150,18 @@ namespace MonoTests.Microsoft.Build.Execution
 			var bm = new BuildManager ();
 			bm.BeginBuild (new BuildParameters () { Loggers = new ILogger [] {new ConsoleLogger (LoggerVerbosity.Diagnostic, TextWriter.Null.WriteLine, null, null)} });
 			DateTime waitDone = DateTime.MinValue;
-			DateTime beforeExec = DateTime.Now;
+			DateTime beforeExec = DateTime.UtcNow;
 			var l = new List<BuildSubmission> ();
 			for (int i = 0; i < 10; i++) {
 				var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
 				l.Add (sub);
-				sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
+				sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
 			}
 			bm.EndBuild ();
 			Assert.IsTrue (l.All (s => s.BuildResult.OverallResult == BuildResultCode.Success), "#1");
-			DateTime endBuildDone = DateTime.Now;
-			Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
-			Assert.IsTrue (endBuildDone > waitDone, "#3");
+			DateTime endBuildDone = DateTime.UtcNow;
+			AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
+			AssertHelper.Greater (endBuildDone, waitDone, "#3");
 		}
 		
 		[Test]
diff --git a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
index f14bcd864ac..1bd8f7cdcba 100644
--- a/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
+++ b/mcs/class/Microsoft.Build/Test/Microsoft.Build.Execution/BuildSubmissionTest.cs
@@ -101,15 +101,15 @@ namespace MonoTests.Microsoft.Build.Execution
 			var bm = new BuildManager ();
 			bm.BeginBuild (new BuildParameters ());
 			DateTime waitDone = DateTime.MinValue;
-			DateTime beforeExec = DateTime.Now;
+			DateTime beforeExec = DateTime.UtcNow;
 			var sub = bm.PendBuildRequest (new BuildRequestData (proj, new string [] { "Wait1Sec" }));
-			sub.ExecuteAsync (delegate { waitDone = DateTime.Now; }, null);
+			sub.ExecuteAsync (delegate { waitDone = DateTime.UtcNow; }, null);
 			bm.EndBuild ();
-			Assert.IsTrue (sub.BuildResult.OverallResult == BuildResultCode.Success, "#1");
-			DateTime endBuildDone = DateTime.Now;
-			Assert.IsTrue (endBuildDone - beforeExec >= TimeSpan.FromSeconds (1), "#2");
-			Assert.IsTrue (waitDone >= beforeExec, "#3");
-			Assert.IsTrue (endBuildDone >= waitDone, "#4");
+			Assert.AreEqual (BuildResultCode.Success, sub.BuildResult.OverallResult, "#1");
+			DateTime endBuildDone = DateTime.UtcNow;
+			AssertHelper.GreaterOrEqual (endBuildDone - beforeExec, TimeSpan.FromSeconds (1), "#2");
+			AssertHelper.GreaterOrEqual (waitDone, beforeExec, "#3");
+			AssertHelper.GreaterOrEqual (endBuildDone, waitDone, "#4");
 		}
 		
 		[Test]