rename Mac-specific func test categories for POSIX

We convert the MacOnly functional test category into POSIXOnly, which we also execute on Linux, and we convert the MacTODO category to NonWindowsTODO and exclude it on Linux (as well as on macOS). From microsoft/VFSForGit@9b6fd56 and microsoft/VFSForGit@f47f68c.
microsoft · Aug 18, 2020 · 883f15b · 883f15b
1 parent 66b6acb
commit 883f15b
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/Scalar.FunctionalTests/Categories.cs b/Scalar.FunctionalTests/Categories.cs
@@ -6,13 +6,13 @@ public static class Categories
         public const string GitCommands = "GitCommands";
 
         public const string WindowsOnly = "WindowsOnly";
-        public const string MacOnly = "MacOnly";
+        public const string POSIXOnly = "POSIXOnly";
 
         public const string GitRepository = "GitRepository";
 
         public const string NeedsUpdatesForNonVirtualizedMode = "NeedsUpdatesForNonVirtualizedMode";
 
-        public static class MacTODO
+        public static class NonWindowsTODO
         {
             // Tests requires code updates so that we lock the file instead of looking for a .lock file
             public const string TestNeedsToLockFile = "TestNeedsToLockFile";

diff --git a/Scalar.FunctionalTests/Program.cs b/Scalar.FunctionalTests/Program.cs
@@ -83,9 +83,10 @@ public static void Main(string[] args)
                 ScalarTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.DefaultRunners;
             }
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ||
+                RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                excludeCategories.Add(Categories.MacTODO.TestNeedsToLockFile);
+                excludeCategories.Add(Categories.NonWindowsTODO.TestNeedsToLockFile);
                 excludeCategories.Add(Categories.WindowsOnly);
             }
             else
@@ -99,7 +100,7 @@ public static void Main(string[] args)
                     includeCategories.Remove(Categories.ExtraCoverage);
                 }
 
-                excludeCategories.Add(Categories.MacOnly);
+                excludeCategories.Add(Categories.POSIXOnly);
             }
 
             // For now, run all of the tests not flagged as needing to be updated to work

diff --git a/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/CloneTests.cs b/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/CloneTests.cs
@@ -57,7 +57,7 @@ public void SparseCloneWithNoFetchOfCommitsAndTreesSucceeds()
         }
 
         [TestCase]
-        [Category(Categories.MacOnly)]
+        [Category(Categories.POSIXOnly)]
         public void CloneWithDefaultLocalCacheLocation()
         {
             FileSystemRunner fileSystem = FileSystemRunner.DefaultRunner;

diff --git a/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/FetchStepTests.cs b/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/FetchStepTests.cs
@@ -23,7 +23,7 @@ public FetchStepTests()
         }
 
         [TestCase]
-        [Category(Categories.MacTODO.TestNeedsToLockFile)]
+        [Category(Categories.NonWindowsTODO.TestNeedsToLockFile)]
         public void FetchStepCleansUpStaleFetchLock()
         {
             this.Enlistment.RunVerb("fetch");

diff --git a/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/FetchStepWithoutSharedCacheTests.cs b/Scalar.FunctionalTests/Tests/EnlistmentPerFixture/FetchStepWithoutSharedCacheTests.cs
@@ -102,7 +102,7 @@ public void FetchStepCleansUpBadPrefetchPack()
         }
 
         [TestCase, Order(4)]
-        [Category(Categories.MacTODO.TestNeedsToLockFile)]
+        [Category(Categories.NonWindowsTODO.TestNeedsToLockFile)]
         public void FetchStepFailsWhenItCannotRemoveABadPrefetchPack()
         {
             this.Enlistment.Unregister();

diff --git a/Scalar.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs b/Scalar.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs
@@ -548,17 +548,17 @@ public void RenameFileCommitChangesSwitchBranchSwitchBackTest()
             this.CommitChangesSwitchBranchSwitchBack(fileSystemAction: this.RenameFile);
         }
 
-        // MacOnly because renames of partial folders are blocked on Windows
+        // Mac and Linux only because renames of partial folders are blocked on Windows
         [TestCase]
-        [Category(Categories.MacOnly)]
+        [Category(Categories.POSIXOnly)]
         public void MoveFolderCommitChangesSwitchBranchSwitchBackTest()
         {
             this.CommitChangesSwitchBranchSwitchBack(fileSystemAction: this.MoveFolder);
         }
 
-        // MacOnly because Windows does not support file mode
+        // Mac and Linux only because Windows does not support file mode
         [TestCase]
-        [Category(Categories.MacOnly)]
+        [Category(Categories.POSIXOnly)]
         public void UpdateFileModeOnly()
         {
             const string TestFileName = "test-file-mode";