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

Get e2e tests running 

- correct `--filter` syntax; perform `contains` match on `Name` and not `FullyQualifiedName`
  - `FullyQualifiedName` doesn't seem to include NUnit test case data
- move to latest test package versions
- support recent SDK versions

Background: successful but no-op builds have been common lately
- blocking real work on aspnet/AspNetCore-Internal#1843
This commit is contained in:
Doug Bunting 2019-05-06 15:30:00 -07:00 committed by Doug Bunting
parent 11ab4bd196
commit 064dce2bef
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Cli.FunctionalTests/Cli.FunctionalTests.csproj
View File

@ -10,11 +10,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" /> <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NuGet.Versioning" Version="4.7.0" /> <PackageReference Include="NuGet.Versioning" Version="4.7.0" />
<PackageReference Include="NUnit" Version="3.10.1" /> <PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
test/Cli.FunctionalTests/Util/DotNetUtil.cs
View File

@ -64,8 +64,8 @@ namespace Cli.FunctionalTests.Util
var runtimeVersionString = Regex.Match(info, runtimeVersionPattern, RegexOptions.RightToLeft).Groups[1].Value; var runtimeVersionString = Regex.Match(info, runtimeVersionPattern, RegexOptions.RightToLeft).Groups[1].Value;
var runtimeVersion = SemanticVersion.Parse(runtimeVersionString); var runtimeVersion = SemanticVersion.Parse(runtimeVersionString);
// Supported version range is [2.1.300,2.2.100] (inclusive) // Supported version range is [2.1.300,2.2.210] (inclusive)
if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 100)) if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 210))
{ {
return (sdkVersion, runtimeVersion); return (sdkVersion, runtimeVersion);
} }

2
test/Cli.FunctionalTests/run-tests.ps1
View File

@ -164,7 +164,7 @@ try {
[string[]] $filterArgs = @() [string[]] $filterArgs = @()
if ($TestRuntimeIdentifier) { if ($TestRuntimeIdentifier) {
$filterArgs += '--filter',"rid: $TestRuntimeIdentifier" $filterArgs += '--filter',"Name~rid: $TestRuntimeIdentifier"
} }
Invoke-Block { & $dotnet test ` Invoke-Block { & $dotnet test `