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

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

@ -238,18 +238,14 @@ namespace Microsoft.AspNetCore.Server.IntegrationTesting
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,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
Skip = archSkip,
});
}
Server = server,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
Skip = archSkip,
});
}
}
@ -291,19 +287,15 @@ 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,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
HostingModel = hostingModel,
Skip = skipAncm,
});
}
Server = server,
Tfm = tfm,
ApplicationType = type,
Architecture = arch,
HostingModel = hostingModel,
Skip = skipAncm,
});
}
}