fix close bug

Author: afifi-ins

src/System.Private.ServiceModel/tests/Common/Scenarios/ScenarioTestHelpers.cs

@@ -210,6 +210,12 @@ public static void CloseCommunicationObjects(params ICommunicationObject[] objec
             {
                 comObj.Abort();
             }
+            catch (System.Net.WebSockets.WebSocketException)
+            {
+                // WCF Client has a bug which throws WebSocketException when the server closes the connection.
+                // The remote party closed the WebSocket connection without completing the close handshake.
+                comObj.Abort();
+            }
         }
     }
 

src/System.Private.ServiceModel/tests/Scenarios/Extensibility/WebSockets/WebSocketTests.4.1.0.cs

@@ -168,8 +168,12 @@ public static void WebSocket_Http_Duplex_Buffered(NetHttpMessageEncoding message
                 "The logging done by the Server was not returned via the Callback.");
 
             // *** CLEANUP *** \\
-            ((ICommunicationObject)client).Close();
-            channelFactory.Close();
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
+                ((ICommunicationObject)client).Close();
+                channelFactory.Close();
+            }
         }
         finally
         {
@@ -236,8 +240,12 @@ public static void WebSocket_Http_Duplex_Buffered_KeepAlive(NetHttpMessageEncodi
                 "The logging done by the Server was not returned via the Callback.");
 
             // *** CLEANUP *** \\
-            ((ICommunicationObject)client).Close();
-            channelFactory.Close();
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
+                ((ICommunicationObject)client).Close();
+                channelFactory.Close();
+            }
         }
         finally
         {
@@ -471,7 +479,7 @@ public static void WebSocket_Http_RequestReply_Streamed(NetHttpMessageEncoding m
             }
 
             // *** CLEANUP *** \\
-            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method.
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
             if (!ScenarioTestHelpers.IsLocalHost())
             {
                 ((ICommunicationObject)client).Close();
@@ -529,9 +537,13 @@ public static void WebSocket_Http_RequestReply_Buffered(NetHttpMessageEncoding m
             }
 
             // *** CLEANUP *** \\
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
                 ((ICommunicationObject)client).Close();
                 channelFactory.Close();
             }
+        }
         finally
         {
             // *** ENSURE CLEANUP *** \\
@@ -583,7 +595,7 @@ public static void WebSocket_Http_RequestReply_Buffered_KeepAlive(NetHttpMessage
             }
 
             // *** CLEANUP *** \\
-            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method.
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
             if (!ScenarioTestHelpers.IsLocalHost())
             {
                 ((ICommunicationObject)client).Close();
@@ -642,8 +654,12 @@ public static void WebSocket_Https_RequestReply_Buffered(NetHttpMessageEncoding
             }
 
             // *** CLEANUP *** \\
-            ((ICommunicationObject)client).Close();
-            channelFactory.Close();
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
+                ((ICommunicationObject)client).Close();
+                channelFactory.Close();
+            }
         }
         finally
         {
@@ -699,8 +715,12 @@ public static void WebSocket_Https_RequestReply_Buffered_KeepAlive(NetHttpMessag
             }
 
             // *** CLEANUP *** \\
-            ((ICommunicationObject)client).Close();
-            channelFactory.Close();
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
+                ((ICommunicationObject)client).Close();
+                channelFactory.Close();
+            }
         }
         finally
         {
@@ -865,8 +885,12 @@ public static void WebSocket_Http_VerifyWebSocketsUsed()
             Assert.True(responseFromService, String.Format("Response from the service was not expected. Expected: 'True' but got {0}", responseFromService));
 
             // *** CLEANUP *** \\
-            ((ICommunicationObject)client).Close();
-            channelFactory.Close();
+            // Close the client and channel factory if not running on localhost. CoreWCF has a bug in Close method (on Linux).
+            if (!ScenarioTestHelpers.IsLocalHost())
+            {
+                ((ICommunicationObject)client).Close();
+                channelFactory.Close();
+            }
         }
         finally
         {