From 8588b7716053acc5b47c3097e0616fe8c65c93ac Mon Sep 17 00:00:00 2001
From: Justin Kotalik <jukotali@microsoft.com>
Date: Thu, 15 Mar 2018 10:15:55 -0700
Subject: [PATCH] Re-adding Concurrent read/write tests. Fix flakiness. (#650)

---
 .../AppHostConfig/Http.config                          |  9 +++++----
 .../AppHostConfig/Https.config                         | 10 +++++-----
 .../AppHostConfig/NtlmAuthentation.config              | 10 +++++-----
 .../AppHostConfig/WebsocketsNotSupported.config        |  8 ++++----
 .../Inprocess}/SynchronousReadAndWriteTests.cs         |  8 +++++---
 .../WebsocketTests.cs                                  | 10 ----------
 6 files changed, 24 insertions(+), 31 deletions(-)
 rename test/{IISIntegration.IISServerFunctionalTests => IISIntegration.FunctionalTests/Inprocess}/SynchronousReadAndWriteTests.cs (96%)
 delete mode 100644 test/IISIntegration.IISServerFunctionalTests/WebsocketTests.cs

diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
index 3ab0c4c1b0..18a1aa2e22 100644
--- a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
+++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
@@ -876,6 +876,11 @@
   <location path="" overrideMode="Allow">
     <system.webServer>
       <modules>
+
+        <add name="IsapiFilterModule" lockItem="true" />
+        <add name="BasicAuthenticationModule" lockItem="true" />
+        <add name="IsapiModule" lockItem="true" />
+        <add name="HttpLoggingModule" lockItem="true" />
         <!--
                 <add name="HttpCacheModule" lockItem="true" />
 -->
@@ -883,7 +888,6 @@
         <add name="StaticCompressionModule" lockItem="true" />
         <add name="DefaultDocumentModule" lockItem="true" />
         <add name="DirectoryListingModule" lockItem="true" />
-        <add name="IsapiFilterModule" lockItem="true" />
         <add name="ProtocolSupportModule" lockItem="true" />
         <add name="HttpRedirectionModule" lockItem="true" />
         <add name="ServerSideIncludeModule" lockItem="true" />
@@ -891,7 +895,6 @@
         <add name="AnonymousAuthenticationModule" lockItem="true" />
         <add name="CertificateMappingAuthenticationModule" lockItem="true" />
         <add name="UrlAuthorizationModule" lockItem="true" />
-        <add name="BasicAuthenticationModule" lockItem="true" />
         <add name="WindowsAuthenticationModule" lockItem="true" />
         <!--
                 <add name="DigestAuthenticationModule" lockItem="true" />
@@ -903,8 +906,6 @@
         <add name="RequestFilteringModule" lockItem="true" />
         <add name="CustomLoggingModule" lockItem="true" />
         <add name="CustomErrorModule" lockItem="true" />
-        <add name="IsapiModule" lockItem="true" />
-        <add name="HttpLoggingModule" lockItem="true" />
         <add name="FailedRequestsTracingModule" lockItem="true" />
         <add name="CgiModule" lockItem="true" />
         <add name="FastCgiModule" lockItem="true" />
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config b/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
index 59bbf109cf..e16fd734b7 100644
--- a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
+++ b/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
@@ -876,6 +876,10 @@
     <location path="" overrideMode="Allow">
         <system.webServer>
             <modules>
+              <add name="IsapiFilterModule" lockItem="true" />
+              <add name="BasicAuthenticationModule" lockItem="true" />
+              <add name="IsapiModule" lockItem="true" />
+              <add name="HttpLoggingModule" lockItem="true" />
                 <!--
                 <add name="HttpCacheModule" lockItem="true" />
 -->
@@ -883,7 +887,6 @@
                 <add name="StaticCompressionModule" lockItem="true" />
                 <add name="DefaultDocumentModule" lockItem="true" />
                 <add name="DirectoryListingModule" lockItem="true" />
-                <add name="IsapiFilterModule" lockItem="true" />
                 <add name="ProtocolSupportModule" lockItem="true" />
                 <add name="HttpRedirectionModule" lockItem="true" />
                 <add name="ServerSideIncludeModule" lockItem="true" />
@@ -891,7 +894,6 @@
                 <add name="AnonymousAuthenticationModule" lockItem="true" />
                 <add name="CertificateMappingAuthenticationModule" lockItem="true" />
                 <add name="UrlAuthorizationModule" lockItem="true" />
-                <add name="BasicAuthenticationModule" lockItem="true" />
                 <add name="WindowsAuthenticationModule" lockItem="true" />
                 <!--
                 <add name="DigestAuthenticationModule" lockItem="true" />
@@ -903,8 +905,6 @@
                 <add name="RequestFilteringModule" lockItem="true" />
                 <add name="CustomLoggingModule" lockItem="true" />
                 <add name="CustomErrorModule" lockItem="true" />
-                <add name="IsapiModule" lockItem="true" />
-                <add name="HttpLoggingModule" lockItem="true" />
                 <add name="FailedRequestsTracingModule" lockItem="true" />
                 <add name="CgiModule" lockItem="true" />
                 <add name="FastCgiModule" lockItem="true" />
@@ -1026,4 +1026,4 @@
             </handlers>
         </system.webServer>
     </location>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config b/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
index 0ef1d112c8..d74f6b2e4f 100644
--- a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
+++ b/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
@@ -876,6 +876,10 @@
     <location path="" overrideMode="Allow">
         <system.webServer>
             <modules>
+              <add name="IsapiFilterModule" lockItem="true" />
+              <add name="BasicAuthenticationModule" lockItem="true" />
+              <add name="IsapiModule" lockItem="true" />
+              <add name="HttpLoggingModule" lockItem="true" />
                 <!--
                 <add name="HttpCacheModule" lockItem="true" />
 -->
@@ -883,7 +887,6 @@
                 <add name="StaticCompressionModule" lockItem="true" />
                 <add name="DefaultDocumentModule" lockItem="true" />
                 <add name="DirectoryListingModule" lockItem="true" />
-                <add name="IsapiFilterModule" lockItem="true" />
                 <add name="ProtocolSupportModule" lockItem="true" />
                 <add name="HttpRedirectionModule" lockItem="true" />
                 <add name="ServerSideIncludeModule" lockItem="true" />
@@ -891,7 +894,6 @@
                 <add name="AnonymousAuthenticationModule" lockItem="true" />
                 <add name="CertificateMappingAuthenticationModule" lockItem="true" />
                 <add name="UrlAuthorizationModule" lockItem="true" />
-                <add name="BasicAuthenticationModule" lockItem="true" />
                 <add name="WindowsAuthenticationModule" lockItem="true" />
                 <!--
                 <add name="DigestAuthenticationModule" lockItem="true" />
@@ -903,8 +905,6 @@
                 <add name="RequestFilteringModule" lockItem="true" />
                 <add name="CustomLoggingModule" lockItem="true" />
                 <add name="CustomErrorModule" lockItem="true" />
-                <add name="IsapiModule" lockItem="true" />
-                <add name="HttpLoggingModule" lockItem="true" />
                 <add name="FailedRequestsTracingModule" lockItem="true" />
                 <add name="CgiModule" lockItem="true" />
                 <add name="FastCgiModule" lockItem="true" />
@@ -1037,4 +1037,4 @@
       </security>
     </system.webServer>
   </location>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config b/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
index ce53b89904..541f91ad81 100644
--- a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
+++ b/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
@@ -876,6 +876,10 @@
     <location path="" overrideMode="Allow">
         <system.webServer>
             <modules>
+              <add name="IsapiFilterModule" lockItem="true" />
+              <add name="BasicAuthenticationModule" lockItem="true" />
+              <add name="IsapiModule" lockItem="true" />
+              <add name="HttpLoggingModule" lockItem="true" />
                 <!--
                 <add name="HttpCacheModule" lockItem="true" />
 -->
@@ -883,7 +887,6 @@
                 <add name="StaticCompressionModule" lockItem="true" />
                 <add name="DefaultDocumentModule" lockItem="true" />
                 <add name="DirectoryListingModule" lockItem="true" />
-                <add name="IsapiFilterModule" lockItem="true" />
                 <add name="ProtocolSupportModule" lockItem="true" />
                 <add name="HttpRedirectionModule" lockItem="true" />
                 <add name="ServerSideIncludeModule" lockItem="true" />
@@ -891,7 +894,6 @@
                 <add name="AnonymousAuthenticationModule" lockItem="true" />
                 <add name="CertificateMappingAuthenticationModule" lockItem="true" />
                 <add name="UrlAuthorizationModule" lockItem="true" />
-                <add name="BasicAuthenticationModule" lockItem="true" />
                 <add name="WindowsAuthenticationModule" lockItem="true" />
                 <!--
                 <add name="DigestAuthenticationModule" lockItem="true" />
@@ -903,8 +905,6 @@
                 <add name="RequestFilteringModule" lockItem="true" />
                 <add name="CustomLoggingModule" lockItem="true" />
                 <add name="CustomErrorModule" lockItem="true" />
-                <add name="IsapiModule" lockItem="true" />
-                <add name="HttpLoggingModule" lockItem="true" />
                 <add name="FailedRequestsTracingModule" lockItem="true" />
                 <add name="CgiModule" lockItem="true" />
                 <add name="FastCgiModule" lockItem="true" />
diff --git a/test/IISIntegration.IISServerFunctionalTests/SynchronousReadAndWriteTests.cs b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
similarity index 96%
rename from test/IISIntegration.IISServerFunctionalTests/SynchronousReadAndWriteTests.cs
rename to test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
index 4e218d7392..c79c8a462c 100644
--- a/test/IISIntegration.IISServerFunctionalTests/SynchronousReadAndWriteTests.cs
+++ b/test/IISIntegration.FunctionalTests/Inprocess/SynchronousReadAndWriteTests.cs
@@ -11,8 +11,8 @@ using System.Threading.Tasks;
 using Microsoft.AspNetCore.Testing.xunit;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
-{ 
+namespace Microsoft.AspNetCore.Server.IISIntegration.FunctionalTests
+{
     [Collection(IISTestSiteCollection.Name)]
     public class SynchronousReadAndWriteTests
     {
@@ -23,7 +23,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
             _fixture = fixture;
         }
 
-        [ConditionalFact (Skip = "See https://github.com/aspnet/IISIntegration/issues/629")]
+        [ConditionalFact]
         public async Task ReadAndWriteSynchronously()
         {
             for (int i = 0; i < 100; i++)
@@ -89,6 +89,8 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
                     }
                 }
 
+                Assert.True(socket.Connected);
+
                 var testString = "hello world";
                 var request = $"POST /ReadAndWriteSlowConnection HTTP/1.0\r\n" +
                     $"Content-Length: {testString.Length}\r\n" +
diff --git a/test/IISIntegration.IISServerFunctionalTests/WebsocketTests.cs b/test/IISIntegration.IISServerFunctionalTests/WebsocketTests.cs
deleted file mode 100644
index 1766745b0e..0000000000
--- a/test/IISIntegration.IISServerFunctionalTests/WebsocketTests.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
-{
-    public class WebsocketTests
-    {
-    }
-}