Don't run SharedFxTests.BaselineTest(...) in some cases

- when `!$(ValidateBaseline)`, previous runtimes do not exist
dotnet · Mar 11, 2021 · 64b7204 · 64b7204
1 parent bb003c4
commit 64b7204
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj
@@ -30,6 +30,10 @@
       <_Parameter1>PreviousAspNetCoreReleaseVersion</_Parameter1>
       <_Parameter2>$(PreviousAspNetCoreReleaseVersion)</_Parameter2>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="Microsoft.AspNetCore.TestData">
+      <_Parameter1>ValidateBaseline</_Parameter1>
+      <_Parameter2>$(ValidateBaseline)</_Parameter2>
+    </AssemblyAttribute>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/test/SharedFx.UnitTests/SharedFxTests.cs b/test/SharedFx.UnitTests/SharedFxTests.cs
@@ -17,11 +17,16 @@ namespace Microsoft.AspNetCore
 {
     public class SharedFxTests
     {
-
         [Theory]
         [MemberData(nameof(GetSharedFxConfig))]
         public async Task BaselineTest(SharedFxConfig config)
         {
+            if (!TestData.GetValidateBaseline())
+            {
+                // Inability to validate the package baselines indicates dotnetcli is not up-to-date.
+                return;
+            }
+
             var previousVersion = TestData.GetPreviousAspNetCoreReleaseVersion();
             var url = new Uri($"https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/Runtime/" + previousVersion + "/aspnetcore-runtime-internal-" + previousVersion + "-win-x64.zip");
             var zipName = "assemblies.zip";

diff --git a/test/SharedFx.UnitTests/TestData.cs b/test/SharedFx.UnitTests/TestData.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Linq;
 using System.Reflection;
 
@@ -20,6 +21,9 @@ public class TestData
 
         public static string GetSharedFxRuntimeIdentifier() => GetTestDataValue("SharedFxRuntimeIdentifier");
 
+        public static bool GetValidateBaseline() =>
+            string.Equals(GetTestDataValue("ValidateBaseline"), "true", StringComparison.OrdinalIgnoreCase);
+
         private static string GetTestDataValue(string key)
              => typeof(TestData).Assembly.GetCustomAttributes<TestDataAttribute>().Single(d => d.Key == key).Value;
     }