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

@@ -27,14 +27,13 @@ namespace MonoTests.Features.Serialization
sleepTime = 5 * 1000;
failTime = 2 * 1000;
}
DateTime start = DateTime.Now;
var sw = global::System.Diagnostics.Stopwatch.StartNew ();
Client.Sleep (sleepTime);
DateTime end = DateTime.Now;
TimeSpan diff = end.Subtract (start);
sw.Stop ();
TimeSpan max = TimeSpan.FromMilliseconds(failTime);
Assert.IsTrue (diff < max, "Sleep({0} milisec) must end in less than {1} seconds",sleepTime,failTime);
if (sleepTime > (int) diff.TotalMilliseconds)
Thread.Sleep (sleepTime - (int)diff.TotalMilliseconds); // wait for server thread to release itself
Assert.IsTrue (sw.Elapsed < max, "Sleep({0} milisec) must end in less than {1} seconds",sleepTime,failTime);
if (sleepTime > (int) sw.ElapsedMilliseconds)
Thread.Sleep (sleepTime - (int)sw.ElapsedMilliseconds); // wait for server thread to release itself
}
[Test]

View File

@@ -14,14 +14,17 @@ using MonoTests.stand_alone.WebHarness;
using System.ServiceModel.Dispatcher;
using System.Collections.ObjectModel;
using MonoTests.Helpers;
namespace MonoTests.Features
{
public class Configuration
{
static Configuration() {
var port = NetworkHelpers.FindFreePort ();
onlyServers = Boolean.Parse (ConfigurationManager.AppSettings ["onlyServers"] ?? "false");
onlyClients = Boolean.Parse (ConfigurationManager.AppSettings ["onlyClients"] ?? "false");
endpointBase = ConfigurationManager.AppSettings ["endpointBase"] ?? "http://localhost:9999/";
endpointBase = ConfigurationManager.AppSettings ["endpointBase"] ?? $"http://localhost:{port}/";
if (!endpointBase.EndsWith ("/"))
endpointBase = endpointBase + '/';
logMessages = Boolean.Parse (ConfigurationManager.AppSettings ["logMessages"] ?? "false");

View File

@@ -16,6 +16,8 @@ using System.Text;
using NUnit.Framework;
using MonoTests.Helpers;
namespace MonoTests.System.ServiceModel.PeerResolvers
{
[TestFixture]
@@ -26,6 +28,8 @@ namespace MonoTests.System.ServiceModel.PeerResolvers
[SetUp]
protected void SetUp ()
{
var port = NetworkHelpers.FindFreePort ();
Environment.SetEnvironmentVariable ("MONO_CUSTOMPEERRESOLVERSERVICE_PORT", port.ToString ());
cprs = new CustomPeerResolverService ();
}