Imported Upstream version 3.10.0

Former-commit-id: 172c8e3c300b39d5785c7a3e8dfb08ebdbc1a99b
2014-10-04 11:27:48 +01:00
parent fe777c5c82
commit 8b9b85e7f5
970 changed files with 20242 additions and 31308 deletions
--- a/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
+++ b/mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs
@ -1106,7 +1106,8 @@ namespace MonoTests.System.Threading.Tasks
 		{
 			var task = new TaskFactory ().StartNew (() => { });
 			var ar = (IAsyncResult)task;
-			ar.AsyncWaitHandle.WaitOne ();
+			Assert.IsFalse (ar.CompletedSynchronously, "#1");
+			Assert.IsTrue (ar.AsyncWaitHandle.WaitOne (5000), "#2");
 		}

 		[Test]