Imported Upstream version 5.8.0.22

Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions

View File

@ -1349,9 +1349,9 @@ namespace MonoTests.System.Threading
public static void WhileAlive (Thread t, bool alive, string s)
{
DateTime ti = DateTime.Now;
var sw = SD.Stopwatch.StartNew ();
while (t.IsAlive == alive) {
if ((DateTime.Now - ti).TotalSeconds > 10) {
if (sw.Elapsed.TotalSeconds > 10) {
if (alive) Assert.Fail ("Timeout while waiting for not alive state. " + s);
else Assert.Fail ("Timeout while waiting for alive state. " + s);
}
@ -1360,12 +1360,12 @@ namespace MonoTests.System.Threading
public static bool WhileAliveOrStop (Thread t, bool alive, string s)
{
DateTime ti = DateTime.Now;
var sw = SD.Stopwatch.StartNew ();
while (t.IsAlive == alive) {
if (t.ThreadState == ThreadState.Stopped)
return false;
if ((DateTime.Now - ti).TotalSeconds > 10) {
if (sw.Elapsed.TotalSeconds > 10) {
if (alive) Assert.Fail ("Timeout while waiting for not alive state. " + s);
else Assert.Fail ("Timeout while waiting for alive state. " + s);
}