Fixing the connection timeout (#1910)

* Fix the connection timeout for design mode client and socket communication manager.
microsoft · Feb 3, 2019 · 031cd31 · 031cd31
1 parent b7b6283
commit 031cd31
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs b/src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
@@ -95,10 +95,10 @@ public void ConnectToClientAndProcessRequests(int port, ITestRequestManager test
             EqtTrace.Info("Trying to connect to server on port : {0}", port);
             this.communicationManager.SetupClientAsync(new IPEndPoint(IPAddress.Loopback, port));
 
-            var connectionTimeout = EnvironmentHelper.GetConnectionTimeout();
+            var connectionTimeoutInSecs = EnvironmentHelper.GetConnectionTimeout();
 
             // Wait for the connection to the server and listen for requests.
-            if (this.communicationManager.WaitForServerConnection(connectionTimeout))
+            if (this.communicationManager.WaitForServerConnection(connectionTimeoutInSecs * 1000))
             {
                 this.communicationManager.SendMessage(MessageType.SessionConnected);
                 this.ProcessRequests(testRequestManager);
@@ -113,7 +113,7 @@ public void ConnectToClientAndProcessRequests(int port, ITestRequestManager test
                         CommunicationUtilitiesResources.ConnectionTimeoutErrorMessage,
                         CoreUtilitiesConstants.VstestConsoleProcessName,
                         "translation layer",
-                        connectionTimeout,
+                        connectionTimeoutInSecs,
                         EnvironmentHelper.VstestConnectionTimeout)
                     );
             }

diff --git a/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs b/src/Microsoft.TestPlatform.CommunicationUtilities/SocketCommunicationManager.cs
@@ -172,7 +172,7 @@ public async Task SetupClientAsync(IPEndPoint endpoint)
 
             Stopwatch watch = new Stopwatch();
             watch.Start();
-            var connectionTimeout = EnvironmentHelper.GetConnectionTimeout();
+            var connectionTimeout = EnvironmentHelper.GetConnectionTimeout() * 1000;
             do
             {
                 try