Reinstated test skipping for build server

sillsdev · Jul 12, 2024 · 430ccd7 · 430ccd7
1 parent d33293a
commit 430ccd7
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -33,4 +33,4 @@ jobs:
       run: dotnet build
     - name: Test
       # space after -- before RunConfig is required
-      run: dotnet test --no-build -maxcpucount:1 --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" -- RunConfiguration.CollectSourceInformation=true
+      run: dotnet test  --filter "TestCategory != SkipOnCI" --no-build -maxcpucount:1 --logger "GitHubActions;summary.includePassedTests=true;summary.includeSkippedTests=true" -- RunConfiguration.CollectSourceInformation=true
diff --git a/build/WeSay.proj b/build/WeSay.proj
@@ -6,7 +6,7 @@
 		<SolutionPath>$(RootDir)/$(Solution)</SolutionPath>
 		<Configuration Condition="'$(Configuration)'==''">Debug</Configuration>
 		<LinuxExcludeCategories Condition="'$(OS)'!='Windows_NT'">KnownMonoIssue,</LinuxExcludeCategories>
-		<ExtraExcludeCategories Condition="'$(teamcity_version)' != '' Or '$(JENKINS_URL)' != '' Or '$(CI)' != ''">SkipOnTeamCity,$(LinuxExcludeCategories)</ExtraExcludeCategories>
+		<ExtraExcludeCategories Condition="'$(teamcity_version)' != '' Or '$(JENKINS_URL)' != '' Or '$(CI)' != ''">SkipOnCI,$(LinuxExcludeCategories)</ExtraExcludeCategories>
 		<useNUnit-x86 Condition="'$(OS)'=='Windows_NT'">true</useNUnit-x86>
 		<Platform Condition="'$(Platform)'==''">x</Platform>
 		<useNUnit-x86 Condition="'$(OS)'!='Windows_NT'">false</useNUnit-x86>

diff --git a/build/build.common.proj b/build/build.common.proj
@@ -5,7 +5,7 @@
 	<PropertyGroup>
 		<useNUnit-x86 Condition="'$(OS)'=='Windows_NT'">true</useNUnit-x86>
 		<useNUnit-x86 Condition="'$(OS)'!='Windows_NT'">false</useNUnit-x86>
-		<ExtraExcludeCategories Condition="'$(teamcity_version)' != ''">SkipOnTeamCity,$(ExtraExcludeCategories)</ExtraExcludeCategories>
+		<ExtraExcludeCategories Condition="'$(teamcity_version)' != ''">SkipOnCI,$(ExtraExcludeCategories)</ExtraExcludeCategories>
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/build/build.mono.proj b/build/build.mono.proj
@@ -51,7 +51,7 @@
 			Targets="Build"
 			Properties="Configuration=$(Configuration);Constants=$(Constants)" />
 		<Exec Condition="'$(action)' == 'test'"
-			Command="$(MONO_PREFIX)/bin/mono --debug $(MONO_PREFIX)/lib/mono/4.0/nunit-console.exe -noshadow -exclude=SkipOnTeamCity [!P]*.Tests.dll -xml=WeSay.nunit-output.xml"
+			Command="$(MONO_PREFIX)/bin/mono --debug $(MONO_PREFIX)/lib/mono/4.0/nunit-console.exe -noshadow -exclude=SkipOnCI [!P]*.Tests.dll -xml=WeSay.nunit-output.xml"
 			WorkingDirectory="$(RootDir)/output/$(Configuration)"
 			Timeout="4500000"/>
 	</Target>

diff --git a/src/Addin.Transform.Tests/LibreOfficePdfTests.cs b/src/Addin.Transform.Tests/LibreOfficePdfTests.cs
@@ -107,7 +107,7 @@ private static void CopyFolder(string sourceFolder, string destFolder)
 		}
 
 		[Test]
-		[Category("SkipOnTeamCity")]
+		[Category("SkipOnCI")]
 		[Platform(Exclude = "Win", Reason = "Mono only test")]
 		public void TestOpenDocumentPdf()
 		{
@@ -132,7 +132,7 @@ public void TestOpenDocumentPdf()
 		}
 
 		[Test]
-		[Category("SkipOnTeamCity")]
+		[Category("SkipOnCI")]
 		[Platform(Exclude = "Win", Reason = "Mono only test")]
 		public void TestOpenDocumentPdfOpen()
 		{

diff --git a/src/Addin.Transform.Tests/PdfMakerTests.cs b/src/Addin.Transform.Tests/PdfMakerTests.cs
@@ -61,14 +61,14 @@ public void TearDown()
 		}
 
 		[Test]
-		[Category("SkipOnTeamCity")]
+		[Category("SkipOnCI")]
 		public void CreatePDF()
 		{
 			LaunchAddin();
 		}
 
 		[Test]
-		[Category("SkipOnTeamCity")]
+		[Category("SkipOnCI")]
 		public void CreatePdfAndOpen()
 		{
 			LaunchAddin();

diff --git a/src/Addin.Transform.Tests/SfmTransformerTests.cs b/src/Addin.Transform.Tests/SfmTransformerTests.cs
@@ -11,7 +11,7 @@
 
 namespace Addin.Transform.Tests
 {
-	[Category("SkipOnTeamCity")] // Uses ProgressDialog during transforms. 
+	[Category("SkipOnCI")] // Uses ProgressDialog during transforms. 
 	[TestFixture]
 	public class SfmTransformerTests
 	{

diff --git a/src/WeSay.ConfigTool.Tests/AdminWindowTests.cs b/src/WeSay.ConfigTool.Tests/AdminWindowTests.cs
@@ -12,7 +12,7 @@
 
 namespace WeSay.ConfigTool.Tests
 {
-	[Category("SkipOnTeamCity")]
+	[Category("SkipOnCI")]
 	[TestFixture, Apartment(ApartmentState.STA)]
 	public class AdminWindowTests
 	{
@@ -136,7 +136,7 @@ public void CreateAndOpenProject_EnglishAsVernacular_DoesNotCrash()
 	}
 
 	/* these are more modern, without use of static, "pretend" project, or the big setup/teardown of the old style */
-	[Category("SkipOnTeamCity")]
+	[Category("SkipOnCI")]
 	[TestFixture]
 	public class MoreAdminWindowTests
 	{

diff --git a/src/WeSay.UI.Tests/AutoCompleteWithCreationBoxTests.cs b/src/WeSay.UI.Tests/AutoCompleteWithCreationBoxTests.cs
@@ -11,7 +11,7 @@
 
 namespace WeSay.UI.Tests
 {
-	[Category("SkipOnTeamCity")]
+	[Category("SkipOnCI")]
 	[TestFixture]
 	public class AutoCompleteWithCreationBoxTests
 	{

diff --git a/src/WeSay.UI.Tests/DetailListTests.cs b/src/WeSay.UI.Tests/DetailListTests.cs
@@ -7,7 +7,7 @@
 
 namespace WeSay.UI.Tests
 {
-	[Category("SkipOnTeamCity")]
+	[Category("SkipOnCI")]
 	[TestFixture, Apartment(ApartmentState.STA)]
 	public class DetailListTests
 	{

diff --git a/src/WeSay.UI.Tests/GeckoListBoxTests.cs b/src/WeSay.UI.Tests/GeckoListBoxTests.cs
@@ -141,7 +141,7 @@ public void TestDrawItem()
 		}
 
 		[Test]
-		[Category("SkipOnTeamCity")]
+		[Category("SkipOnCI")]
 		[Ignore("FLAKY - sometimes fails in run all in VS.")]
 		public void TestGetRectangle()
 		{

diff --git a/src/WeSay.UI.Tests/ReferenceCollectionEditorTests.cs b/src/WeSay.UI.Tests/ReferenceCollectionEditorTests.cs
@@ -11,7 +11,7 @@
 
 namespace WeSay.UI.Tests
 {
-	[Category("SkipOnTeamCity")]
+	[Category("SkipOnCI")]
 	[TestFixture]
 	public class ReferenceCollectionEditorTests : IReceivePropertyChangeNotifications
 	{