Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Guarantee that ANCM package dlls are used for back compat tests #10858

Merged
merged 4 commits into from
Jun 6, 2019
Merged

Guarantee that ANCM package dlls are used for back compat tests #10858

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e84679
guarantee that ANCM package dlls are used for back compat tests
jkotalik Jun 4, 2019
1a4fadd
rename
jkotalik Jun 4, 2019
954a3c1
more rename
jkotalik Jun 4, 2019
b5f8648
Better fix
jkotalik Jun 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rename
  • Loading branch information
@jkotalik
jkotalik committed Jun 4, 2019
commit 1a4fadd736230ccf13cde1c2d8218d0875b34daf
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/Common.FunctionalTests/Utilities/Helpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static class Helpers

public static string GetInProcessTestSitesName()
{
return DeployerSelector.IsForwardsCompatibilityTest ? "InProcessForwardsCompatWebSite" : "InProcessWebSite";
return DeployerSelector.IsNewShimTest ? "InProcessForwardsCompatWebSite" : "InProcessWebSite";
}

public static async Task AssertStarts(this IISDeploymentResult deploymentResult, string path = "/HelloWorld")
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.FunctionalTests/DeployerSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static class DeployerSelector
{
public static ServerType ServerType => ServerType.IIS;
public static bool IsForwardsCompatibilityTest => false;
public static bool IsNewShimTest => false;
public static bool HasNewShim => true;
public static bool HasNewHandler => true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.NewHandler.FunctionalTests/DeployerSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static class DeployerSelector
{
public static ServerType ServerType => ServerType.IIS;
public static bool IsForwardsCompatibilityTest => false;
public static bool IsNewShimTest => false;
public static bool HasNewShim => false;
public static bool HasNewHandler => true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/DeployerSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static class DeployerSelector
{
public static ServerType ServerType => ServerType.IIS;
public static bool IsForwardsCompatibilityTest => true;
public static bool IsNewShimTest => true;
public static bool HasNewShim => true;
public static bool HasNewHandler => false;
}
Expand Down
6 changes: 3 additions & 3 deletions src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/ForwardsCompatibilityTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,17 @@
namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
{
[Collection(IISTestSiteCollection.Name)]
public class ForwardsCompatibilityTests : FixtureLoggedTest
public class NewShimTests : FixtureLoggedTest
{
private readonly IISTestSiteFixture _fixture;

public ForwardsCompatibilityTests(IISTestSiteFixture fixture) : base(fixture)
public NewShimTests(IISTestSiteFixture fixture) : base(fixture)
{
_fixture = fixture;
}

[ConditionalFact]
public async Task CheckForwardsCompatibilityIsUsed()
public async Task CheckNewShimIsUsed()
{
var response = await _fixture.Client.GetAsync("/HelloWorld");
var handles = _fixture.DeploymentResult.HostProcess.Modules;
Expand Down
4 changes: 2 additions & 2 deletions src/Servers/IIS/IIS/test/IIS.NewShim.FunctionalTests/IIS.NewShim.FunctionalTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

<PropertyGroup>
<TargetFramework>netcoreapp3.0</TargetFramework>
<TestGroupName>IISForwardsCompatibility.FunctionalTests</TestGroupName>
<TestGroupName>IISNewShim.FunctionalTests</TestGroupName>
<DisableFastUpToDateCheck>True</DisableFastUpToDateCheck>
<SkipTests Condition=" '$(SkipIISForwardsCompatibilityTests)' == 'true' ">true</SkipTests>
<SkipTests Condition=" '$(SkipIISNewShimTests)' == 'true' ">true</SkipTests>
</PropertyGroup>

<Import Project="../FunctionalTest.props" />
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IIS/test/IISExpress.FunctionalTests/DeployerSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests
public static class DeployerSelector
{
public static ServerType ServerType => ServerType.IISExpress;
public static bool IsForwardsCompatibilityTest => false;
public static bool IsNewShimTest => false;
public static bool HasNewShim => true;
public static bool HasNewHandler => true;
}
Expand Down
2 changes: 1 addition & 1 deletion src/Servers/IIS/IISIntegration.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "IIS\test\Co
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.NewHandler.FunctionalTests", "IIS\test\IIS.NewHandler.FunctionalTests\IIS.NewHandler.FunctionalTests.csproj", "{582B07BC-73F4-4689-8557-B039298BD82C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.ForwardsCompatibility.FunctionalTests", "IIS\test\IIS.ForwardsCompatibility.FunctionalTests\IIS.ForwardsCompatibility.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IIS.NewShim.FunctionalTests", "IIS\test\IIS.NewShim.FunctionalTests\IIS.NewShim.FunctionalTests.csproj", "{D1EA5D99-28FD-4197-81DE-17098846B38B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestTasks", "IIS\test\testassets\TestTasks\TestTasks.csproj", "{2DD1269D-131C-4531-BB0D-7BE0EF8E56D0}"
EndProject
Expand Down