Imported Upstream version 4.4.0.182

Former-commit-id: ea38b2115ac3af9a394fe6cddf2be2acd11bc002
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-06-14 09:39:34 +00:00
parent ee13743634
commit 180e8b1935
125 changed files with 1658 additions and 521 deletions

View File

@@ -1671,6 +1671,9 @@ namespace MonoTests.System.IO
} catch (FileNotFoundException) {
// Only run this test on platforms where /dev/zero exists
Assert.Ignore();
} catch (DirectoryNotFoundException) {
// Only run this test on platforms where /dev exists
Assert.Ignore();
}
// this shouldn't throw

View File

@@ -304,7 +304,7 @@ namespace MonoTests.System.Threading
});
}
Assert.IsTrue (ce.Wait (1000), "#1");
Assert.IsTrue (ce.Wait (10000), "#1");
}
}
}

View File

@@ -103,7 +103,7 @@ namespace MonoTests.System.Threading {
[Test] // bug #320950
public void TestDispose2 ()
{
Timer t = new Timer (o => Callback (o), null, 10, 10);
Timer t = new Timer (o => DoNothing (o), null, 10, 10);
t.Dispose ();
t.Dispose ();
}