Merge pull request #2698 from esdrubal/iosxmlarray

[mono.git] / mcs / class / System / Test / System.Net / WebClientTest.cs

diff --git a/mcs/class/System/Test/System.Net/WebClientTest.cs b/mcs/class/System/Test/System.Net/WebClientTest.cs
index 4b42be97f22f5ab5fc052097ed1a42e5a61da720..b671e9e92358dec824ecbdf2a6f615640cfd056e 100644 (file)
--- a/mcs/class/System/Test/System.Net/WebClientTest.cs
+++ b/mcs/class/System/Test/System.Net/WebClientTest.cs
@@ -1423,9 +1423,7 @@ namespace MonoTests.System.Net
                        IPEndPoint ep = NetworkHelpers.LocalEphemeralEndPoint ();
                        string url = "http://" + ep.ToString () + "/test/";
 
-                       using (SocketResponder responder = new SocketResponder (ep, new SocketRequestHandler (EchoRequestHandler))) {
-                               responder.Start ();
-
+                       using (SocketResponder responder = new SocketResponder (ep, s => EchoRequestHandler (s))) {
                                WebClient wc = new WebClient ();
                                wc.Encoding = Encoding.ASCII;
 
@@ -1855,7 +1853,8 @@ namespace MonoTests.System.Net
                [Category ("AndroidNotWorking")] // Test suite hangs if the tests runs as part of the entire BCL suite. Works when only this fixture is ran
                public void UploadFileAsyncContentType ()
                {
-                       var serverUri = "http://localhost:13370/";
+                       var port = NetworkHelpers.FindFreePort ();
+                       var serverUri = "http://localhost:" + port + "/";
                        var filename = Path.GetTempFileName ();
 
                        HttpListener listener = new HttpListener ();
@@ -1880,10 +1879,8 @@ namespace MonoTests.System.Net
                        var ep = NetworkHelpers.LocalEphemeralEndPoint ();
                        string url = "http://" + ep.ToString() + "/test/";
 
-                       using (var responder = new SocketResponder (ep, EchoRequestHandler))
+                       using (var responder = new SocketResponder (ep, s => EchoRequestHandler (s)))
                        {
-                               responder.Start ();
-
                                var webClient = new WebClient ();
 
                                var cancellationTokenSource = new CancellationTokenSource ();