Imported Upstream version 3.8.0

Former-commit-id: 6a76a29bd07d86e57c6c8da45c65ed5447d38a61

mcs/class/corlib/Test/System.Threading.Tasks/TaskTest.cs

@@ -276,7 +276,7 @@ namespace MonoTests.System.Threading.Tasks
 					tasks[i] = Task.Factory.StartNew (delegate { Thread.Sleep (0); });
 				}
 
-				Assert.IsTrue (Task.WaitAll (tasks, 2000));
+				Assert.IsTrue (Task.WaitAll (tasks, 5000));
 			}
 		}
 
@@ -904,7 +904,11 @@ namespace MonoTests.System.Threading.Tasks
 				args.SetObserved ();
 			};
 			var inner = new ApplicationException ();
-			Task.Factory.StartNew (() => { throw inner; });
+			Thread t = new Thread (delegate () {
+					Task.Factory.StartNew (() => { Console.WriteLine ("HIT!"); throw inner; });
+				});
+			t.Start ();
+			t.Join ();
 			Thread.Sleep (1000);
 			GC.Collect ();
 			Thread.Sleep (1000);
@@ -1928,7 +1932,7 @@ namespace MonoTests.System.Threading.Tasks
 		}
 
 		[Test]
-		[Category("MobileNotWorking")]
+		[Category("NotWorking")]
 		public void TaskContinuationChainLeak()
 		{
 			// Start cranking out tasks, starting each new task upon completion of and from inside the prior task.