huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #11301 - revert workaround for test matrix 

I suspect that this workaround is now causing our tests to fail, and we
wanted to get rid of it anyway.
This commit is contained in:
Ryan Nowak 2019-09-25 15:11:21 -07:00 committed by wtgodbe
parent ac48ceaab2
commit 5409bd7270
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Hosting/Server.IntegrationTesting/src/TestMatrix.cs
View File

@ -238,9 +238,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
VaryByAncmHostingModel(variants, server, tfm, type, arch, archSkip); VaryByAncmHostingModel(variants, server, tfm, type, arch, archSkip);
} }
// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
else if (string.IsNullOrEmpty(archSkip))
{
variants.Add(new TestVariant() variants.Add(new TestVariant()
{ {
Server = server, Server = server,
@ -251,7 +248,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
}); });
} }
} }
}
private string SkipIfArchitectureNotSupportedOnCurrentSystem(RuntimeArchitecture arch) private string SkipIfArchitectureNotSupportedOnCurrentSystem(RuntimeArchitecture arch)
{ {
@ -291,9 +287,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
} }
} }
// TODO: remove this workaround: https://github.com/aspnet/AspNetCore/issues/11301
if (string.IsNullOrEmpty(skipAncm))
{
variants.Add(new TestVariant() variants.Add(new TestVariant()
{ {
Server = server, Server = server,
@ -305,7 +298,6 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
}); });
} }
} }
}
private void CheckForSkips(List<TestVariant> variants) private void CheckForSkips(List<TestVariant> variants)
{ {