diff --git a/build/dependencies.props b/build/dependencies.props index b6aacd6aef..ac4dc8a223 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -10,7 +10,7 @@ 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 - 0.6.0-preview1-34326 + 0.6.0-a-preview1-tratcher-exp-17050 2.2.0-preview1-34326 2.2.0-preview1-34326 2.2.0-preview1-34326 diff --git a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs index 22b1c3ffc0..60bd46b717 100644 --- a/test/ServerComparison.FunctionalTests/HelloWorldTest.cs +++ b/test/ServerComparison.FunctionalTests/HelloWorldTest.cs @@ -38,10 +38,8 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetApplicationPath(variant.ApplicationType), - EnvironmentName = "HelloWorld", // Will pick the Start class named 'StartupHelloWorld', - ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "Http.config", "nginx.conf"), - SiteName = "HttpTestSite", // This is configured in the Http.config + ApplicationPath = Helpers.GetApplicationPath(), + ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"), }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/ServerComparison.FunctionalTests/Helpers.cs b/test/ServerComparison.FunctionalTests/Helpers.cs index 68f9e62c08..3e1ef3979d 100644 --- a/test/ServerComparison.FunctionalTests/Helpers.cs +++ b/test/ServerComparison.FunctionalTests/Helpers.cs @@ -9,7 +9,7 @@ namespace ServerComparison.FunctionalTests { public class Helpers { - public static string GetApplicationPath(ApplicationType applicationType) + public static string GetApplicationPath() { var applicationBasePath = AppContext.BaseDirectory; @@ -45,5 +45,18 @@ namespace ServerComparison.FunctionalTests return content; } + + public static string GetNginxConfigContent(ServerType serverType, string nginxConfig) + { + var applicationBasePath = AppContext.BaseDirectory; + + string content = null; + if (serverType == ServerType.Nginx) + { + content = File.ReadAllText(Path.Combine(applicationBasePath, nginxConfig)); + } + + return content; + } } } \ No newline at end of file diff --git a/test/ServerComparison.FunctionalTests/Http.config b/test/ServerComparison.FunctionalTests/Http.config deleted file mode 100644 index b8f9e8f14a..0000000000 --- a/test/ServerComparison.FunctionalTests/Http.config +++ /dev/null @@ -1,1031 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/ServerComparison.FunctionalTests/NoCompression.config b/test/ServerComparison.FunctionalTests/NoCompression.config index a321209a4e..9d9e0e6b42 100644 --- a/test/ServerComparison.FunctionalTests/NoCompression.config +++ b/test/ServerComparison.FunctionalTests/NoCompression.config @@ -177,7 +177,9 @@ - + + + @@ -925,6 +927,7 @@ + diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthentication.config b/test/ServerComparison.FunctionalTests/NtlmAuthentication.config deleted file mode 100644 index 0a86520cf4..0000000000 --- a/test/ServerComparison.FunctionalTests/NtlmAuthentication.config +++ /dev/null @@ -1,1043 +0,0 @@ - - - - - - - - -
-
-
-
-
-
-
-
- - - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
-
-
- -
-
-
- -
-
- -
-
- -
-
-
- - -
-
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs b/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs index dc1c8d1feb..1daefe6c02 100644 --- a/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs +++ b/test/ServerComparison.FunctionalTests/NtlmAuthenticationTest.cs @@ -37,10 +37,8 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetApplicationPath(variant.ApplicationType), + ApplicationPath = Helpers.GetApplicationPath(), EnvironmentName = "NtlmAuthentication", // Will pick the Start class named 'StartupNtlmAuthentication' - ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "NtlmAuthentication.config", nginxConfig: null), - SiteName = "NtlmAuthenticationTestSite", // This is configured in the NtlmAuthentication.config }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs b/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs index cd0f135e90..c11ca690aa 100644 --- a/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs +++ b/test/ServerComparison.FunctionalTests/ResponseCompressionTests.cs @@ -93,13 +93,17 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetApplicationPath(variant.ApplicationType), + ApplicationPath = Helpers.GetApplicationPath(), EnvironmentName = "ResponseCompression", - ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, - hostCompression ? "http.config" : "NoCompression.config", - hostCompression ? "nginx.conf" : "NoCompression.conf"), - SiteName = "HttpTestSite", // This is configured in the Http.config }; + if (hostCompression) + { + deploymentParameters.ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"); + } + else + { + deploymentParameters.ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "NoCompression.config", "NoCompression.conf"); + } using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) { diff --git a/test/ServerComparison.FunctionalTests/ResponseTests.cs b/test/ServerComparison.FunctionalTests/ResponseTests.cs index 9d47fcad57..583d2fdd33 100644 --- a/test/ServerComparison.FunctionalTests/ResponseTests.cs +++ b/test/ServerComparison.FunctionalTests/ResponseTests.cs @@ -86,10 +86,9 @@ namespace ServerComparison.FunctionalTests var deploymentParameters = new DeploymentParameters(variant) { - ApplicationPath = Helpers.GetApplicationPath(variant.ApplicationType), + ApplicationPath = Helpers.GetApplicationPath(), EnvironmentName = "Responses", - ServerConfigTemplateContent = Helpers.GetConfigContent(variant.Server, "Http.config", "nginx.conf"), - SiteName = "HttpTestSite", // This is configured in the Http.config + ServerConfigTemplateContent = Helpers.GetNginxConfigContent(variant.Server, "nginx.conf"), }; using (var deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory)) diff --git a/test/ServerComparison.TestSites/StartupHelloWorld.cs b/test/ServerComparison.TestSites/Startup.cs similarity index 94% rename from test/ServerComparison.TestSites/StartupHelloWorld.cs rename to test/ServerComparison.TestSites/Startup.cs index 8f1337d6ea..bde47802c9 100644 --- a/test/ServerComparison.TestSites/StartupHelloWorld.cs +++ b/test/ServerComparison.TestSites/Startup.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Logging; namespace ServerComparison.TestSites { - public class StartupHelloWorld + public class Startup { public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { diff --git a/test/ServerComparison.TestSites/web.config b/test/ServerComparison.TestSites/web.config deleted file mode 100644 index 3379e820ea..0000000000 --- a/test/ServerComparison.TestSites/web.config +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file