Merge pull request #973 from TestCentric/issue-972

Remove tests of pluggable agents from build
TestCentric · Apr 24, 2023 · 3d9d2a9 · 3d9d2a9
2 parents 012bca1 + 855238c
commit 3d9d2a9
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 51 deletions.
diff --git a/build.cake b/build.cake
@@ -13,7 +13,7 @@ static string[] VALID_CONFIGS = new [] { "Release", "Debug" };
 // NOTE: This must match what is actually referenced by
 // the GUI test model project. Hopefully, this is a temporary
 // fix, which we can get rid of in the future.
-const string REF_ENGINE_VERSION = "2.0.0-dev00062";
+const string REF_ENGINE_VERSION = "2.0.0-dev00064";
 
 const string PACKAGE_NAME = "testcentric-gui";
 const string NUGET_PACKAGE_NAME = "TestCentric.GuiRunner";
@@ -22,7 +22,7 @@ const string GUI_RUNNER = "testcentric.exe";
 const string GUI_TESTS = "*.Tests.dll";
 
 // Load the recipe
-#load nuget:?package=TestCentric.Cake.Recipe&version=1.0.0-dev00042
+#load nuget:?package=TestCentric.Cake.Recipe&version=1.0.0-dev00043
 // Comment out above line and uncomment below for local tests of recipe changes
 //#load ../TestCentric.Cake.Recipe/recipe/*.cake
 

diff --git a/package-tests.cake b/package-tests.cake
@@ -76,25 +76,21 @@ public static void DefinePackageTests()
             Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net60AgentLauncher") }
         }));
 
-    // TODO: AspNetCore test won't run on AppVeyor under .NET 7.0 - we don't yet know why
-    if (!BuildSettings.IsRunningOnAppVeyor)
-        PackageTests.Add(new PackageTest(1, "AspNetCore70Test", "Run test using AspNetCore under .NET 7.0",
-            "net7.0/aspnetcore-test.dll",
-            new ExpectedResult("Passed")
-            {
-                Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net70AgentLauncher") }
-            }));
+    PackageTests.Add(new PackageTest(1, "AspNetCore70Test", "Run test using AspNetCore under .NET 7.0",
+        "net7.0/aspnetcore-test.dll",
+        new ExpectedResult("Passed")
+        {
+            Assemblies = new [] { new ExpectedAssemblyResult("aspnetcore-test.dll", "Net70AgentLauncher") }
+        }));
 
 	// Windows Forms Tests
 
-	// TODO: Windows Forms tests won't run on AppVeyor under .NET 5.0 or 7.0, we don't yet know why
-    if (!BuildSettings.IsRunningOnAppVeyor)
-        PackageTests.Add(new PackageTest(1, "Net50WindowsFormsTest", "Run test using windows forms under .NET 5.0",
-            "net5.0-windows/windows-forms-test.dll",
-            new ExpectedResult("Passed")
-            {
-                Assemblies = new [] { new ExpectedAssemblyResult("windows-forms-test.dll", "Net60AgentLauncher") }
-            }));
+    PackageTests.Add(new PackageTest(1, "Net50WindowsFormsTest", "Run test using windows forms under .NET 5.0",
+        "net5.0-windows/windows-forms-test.dll",
+        new ExpectedResult("Passed")
+        {
+            Assemblies = new [] { new ExpectedAssemblyResult("windows-forms-test.dll", "Net60AgentLauncher") }
+        }));
 
     PackageTests.Add(new PackageTest(1, "Net60WindowsFormsTest", "Run test using windows forms under .NET 6.0",
         "net6.0-windows/windows-forms-test.dll",
@@ -123,19 +119,6 @@ public static void DefinePackageTests()
 
     // Level 2 tests are run for PRs and when packages will be published
 
-    // NOTE: Package tests using a pluggable agent must be run after all tests
-    // that assume no pluggable agents are installed!
-
-	PackageTests.Add(new PackageTest(2, "Net20PluggableAgentTest", "Run net35 mock-assembly.dll under .NET 2.0 pluggable agent",
-	    "net35/mock-assembly.dll",
-        MockAssemblyExpectedResult("Net20AgentLauncher"),
-        EngineExtensions.Net20PluggableAgent.SetVersion("2.1.0-dev00018")));
-
-	PackageTests.Add(new PackageTest(2, "NetCore21PluggableAgentTest", "Run .NET Core 2.1 mock-assembly.dll under .NET Core 2.1 pluggable agent",
-		"netcoreapp2.1/mock-assembly.dll",
-        MockAssemblyExpectedResult("NetCore21AgentLauncher"),
-		EngineExtensions.NetCore21PluggableAgent));
-
 	// TODO: Suppress V2 tests until driver is working
     //PackageTests.Add(new PackageTest(2, "NUnitV2Test", "Run mock-assembly.dll built for NUnit V2",
     //	"v2-tests/mock-assembly.dll",
@@ -158,27 +141,10 @@ public static void DefinePackageTests()
         PackageTests.Add(new PackageTest(2, "NUnitProjectTest", "Run an NUnit project",
             "../../TestProject.nunit",
             MockAssemblyExpectedResult(
-                "Net20AgentLauncher", "Net462AgentLauncher", "Net60AgentLauncher", "Net60AgentLauncher"),
+                "Net462AgentLauncher", "Net462AgentLauncher", "Net60AgentLauncher", "Net60AgentLauncher"),
             EngineExtensions.NUnitProjectLoader));
     }
 
-	// TODO: Make this work on AppVeyor
-	const string NET80_MOCK_ASSEMBLY = "../../../net80-pluggable-agent/bin/Release/tests/net8.0/mock-assembly.dll";
-	if (BuildSettings.IsLocalBuild && BuildSettings.Context.FileExists(BuildSettings.OutputDirectory + NET80_MOCK_ASSEMBLY))
-		PackageTests.Add(new PackageTest(2, "NetCore80PluggableAgentTest", "Run mock-assembly.dll targeting Net 8.0 using NetCore80PluggableAgent",
-			NET80_MOCK_ASSEMBLY,
-			new ExpectedResult("Failed")
-			{
-				Total = 36,
-				Passed = 23,
-				Failed = 5,
-				Warnings = 1,
-				Inconclusive = 1,
-				Skipped = 7,
-				Assemblies = new[] { new ExpectedAssemblyResult("mock-assembly.dll", "Net80AgentLauncher") }
-			},
-			EngineExtensions.Net80PluggableAgent));
-
     ExpectedResult MockAssemblyExpectedResult(params string[] agentNames)
     {
         int ncopies = agentNames.Length;

diff --git a/src/TestModel/model/TestCentric.Gui.Model.csproj b/src/TestModel/model/TestCentric.Gui.Model.csproj
@@ -16,8 +16,8 @@
 	<ItemGroup>
 		<PackageReference Include="Mono.Options" Version="6.12.0.148" />
 		<PackageReference Include="NUnit.Engine.Api" Version="3.16.2" />
-		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00062" />
-		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00062" />
+		<PackageReference Include="TestCentric.Engine.Api" Version="2.0.0-dev00064" />
+		<PackageReference Include="TestCentric.Engine" Version="2.0.0-dev00064" />
 	</ItemGroup>
 
 </Project>