Mac: Run GitRepoTests with and without validating the working directory during setup

GVFS/GVFS.FunctionalTests/GVFSTestConfig.cs

@@ -12,6 +12,8 @@ public static class GVFSTestConfig
 
         public static object[] FileSystemRunners { get; set; }
 
+        public static object[] GitCommandTestWorkTreeValidation { get; set; }
+
         public static bool TestGVFSOnPath { get; set; }
 
         public static bool ReplaceInboxProjFS { get; set; }

GVFS/GVFS.FunctionalTests/Program.cs

@@ -1,4 +1,5 @@
 using GVFS.FunctionalTests.Tests;
+using GVFS.FunctionalTests.Tests.GitCommands;
 using GVFS.FunctionalTests.Tools;
 using GVFS.Tests;
 using System;
@@ -43,6 +44,13 @@ public static void Main(string[] args)
             {
                 Console.WriteLine("Running the full suite of tests");
 
+                GVFSTestConfig.GitCommandTestWorkTreeValidation =
+                new object[]
+                {
+                    new object[] { GitRepoTests.ValidateWorkingTreeOptions.ValidateWorkingTree },
+                    new object[] { GitRepoTests.ValidateWorkingTreeOptions.DoNotValidateWorkingTree }
+                };
+
                 if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 {
                     GVFSTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.AllWindowsRunners;
@@ -56,6 +64,11 @@ public static void Main(string[] args)
             {
                 excludeCategories.Add(Categories.FullSuiteOnly);
                 GVFSTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.DefaultRunners;
+                GVFSTestConfig.GitCommandTestWorkTreeValidation = 
+                new object[] 
+                { 
+                    new object[] { GitRepoTests.ValidateWorkingTreeOptions.ValidateWorkingTree } 
+                };
             }
 
             if (runner.HasCustomArg("--windows-only"))

GVFS/GVFS.FunctionalTests/Tests/GitCommands/AddStageTests.cs

@@ -5,11 +5,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class AddStageTests : GitRepoTests
     {
-        public AddStageTests() : base(enlistmentPerTest: false)
+        public AddStageTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: false, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/CheckoutTests.cs

@@ -11,11 +11,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class CheckoutTests : GitRepoTests
     {
-        public CheckoutTests() : base(enlistmentPerTest: true)
+        public CheckoutTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/CherryPickConflictTests.cs

@@ -2,11 +2,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class CherryPickConflictTests : GitRepoTests
     {
-        public CherryPickConflictTests() : base(enlistmentPerTest: true)
+        public CherryPickConflictTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/CreatePlaceholderTests.cs

@@ -7,13 +7,14 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class CreatePlaceholderTests : GitRepoTests
     {
         private static readonly string FileToRead = Path.Combine("GVFS", "GVFS", "Program.cs");
 
-        public CreatePlaceholderTests() : base(enlistmentPerTest: true)
+        public CreatePlaceholderTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/DeleteEmptyFolderTests.cs

@@ -4,11 +4,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class DeleteEmptyFolderTests : GitRepoTests
     {
-        public DeleteEmptyFolderTests() : base(enlistmentPerTest: true)
+        public DeleteEmptyFolderTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/EnumerationMergeTest.cs

@@ -2,15 +2,16 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class EnumerationMergeTest : GitRepoTests
     {
         // Commit that found GvFlt Bug 12258777: Entries are sometimes skipped during 
         // enumeration when they don't fit in a user's buffer
         private const string EnumerationReproCommitish = "FunctionalTests/20170602";
 
-        public EnumerationMergeTest() : base(enlistmentPerTest: true)
+        public EnumerationMergeTest(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitCommandsTests.cs

@@ -8,7 +8,7 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class GitCommandsTests : GitRepoTests
     {
@@ -26,7 +26,8 @@ public class GitCommandsTests : GitRepoTests
         private static readonly string RenameFolderPathFrom = Path.Combine("GVFS", "GVFS.Common", "PrefetchPacks");
         private static readonly string RenameFolderPathTo = Path.Combine("GVFS", "GVFS.Common", "PrefetchPacksRenamed");
 
-        public GitCommandsTests() : base(enlistmentPerTest: false)
+        public GitCommandsTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: false, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/GitRepoTests.cs

@@ -13,6 +13,8 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
     [TestFixture]
     public abstract class GitRepoTests
     {
+        public const string ValidateWorkingTree = "WorkTreeValidation";
+
         protected const string ConflictSourceBranch = "FunctionalTests/20170206_Conflict_Source";
         protected const string ConflictTargetBranch = "FunctionalTests/20170206_Conflict_Target";
         protected const string NoConflictSourceBranch = "FunctionalTests/20170209_NoConflict_Source";
@@ -23,13 +25,27 @@ public abstract class GitRepoTests
         protected const string DeepDirectoryWithOneDifferentFile = "FunctionalTests/20181010_DeepFolderOneDifferentFile";
 
         private bool enlistmentPerTest;
+        private bool validateWorkingTree;
 
-        public GitRepoTests(bool enlistmentPerTest)
+        public GitRepoTests(bool enlistmentPerTest, ValidateWorkingTreeOptions validateWorkingTree)
         {
             this.enlistmentPerTest = enlistmentPerTest;
+            this.validateWorkingTree = validateWorkingTree == ValidateWorkingTreeOptions.ValidateWorkingTree;
             this.FileSystem = new SystemIORunner();
         }
 
+        public enum ValidateWorkingTreeOptions
+        {
+            Invalid = 0,
+            DoNotValidateWorkingTree,
+            ValidateWorkingTree,
+        }
+
+        public static object[] WorkTreeValidation
+        {
+            get { return GVFSTestConfig.GitCommandTestWorkTreeValidation; }
+        }
+
         public ControlGitRepo ControlGitRepo
         {
             get; private set;
@@ -74,8 +90,13 @@ public virtual void SetupForTest()
             this.ValidateGitCommand("checkout " + this.ControlGitRepo.Commitish);
 
             this.CheckHeadCommitTree();
-            this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
-                .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath);
+
+            if (this.validateWorkingTree)
+            {
+                this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
+                    .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath);
+            }
+
             this.ValidateGitCommand("status");
         }
 
@@ -90,16 +111,26 @@ protected void TestValidationAndCleanup(bool ignoreCase = false)
             try
             {
                 this.CheckHeadCommitTree();
-                this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
-                    .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, ignoreCase: ignoreCase);
+
+                if (this.validateWorkingTree)
+                {
+                    this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
+                        .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, ignoreCase: ignoreCase);
+                }
 
                 this.RunGitCommand("reset --hard -q HEAD");
                 this.RunGitCommand("clean -d -f -x");
                 this.ValidateGitCommand("checkout " + this.ControlGitRepo.Commitish);
 
                 this.CheckHeadCommitTree();
-                this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
-                    .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, ignoreCase: ignoreCase);
+
+                // If enlistmentPerTest is true we can always validate the working tree because
+                // this is the last place we'll use it
+                if (this.validateWorkingTree || this.enlistmentPerTest)
+                {
+                    this.Enlistment.RepoRoot.ShouldBeADirectory(this.FileSystem)
+                        .WithDeepStructure(this.FileSystem, this.ControlGitRepo.RootPath, ignoreCase: ignoreCase);
+                }
             }
             finally
             {

GVFS/GVFS.FunctionalTests/Tests/GitCommands/HashObjectTests.cs

@@ -4,12 +4,13 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     [Category(Categories.MacTODO.M3)]
     public class HashObjectTests : GitRepoTests
     {
-        public HashObjectTests() : base(enlistmentPerTest: false)
+        public HashObjectTests(ValidateWorkingTreeOptions validateWorkingTree) 
+            : base(enlistmentPerTest: false, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/MergeConflictTests.cs

@@ -4,11 +4,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class MergeConflictTests : GitRepoTests
     {
-        public MergeConflictTests() : base(enlistmentPerTest: true)
+        public MergeConflictTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/RebaseConflictTests.cs

@@ -2,11 +2,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class RebaseConflictTests : GitRepoTests
     {
-        public RebaseConflictTests() : base(enlistmentPerTest: true)
+        public RebaseConflictTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/RebaseTests.cs

@@ -2,11 +2,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class RebaseTests : GitRepoTests
     {
-        public RebaseTests() : base(enlistmentPerTest: true)
+        public RebaseTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetHardTests.cs

@@ -1,15 +1,16 @@
-using GVFS.FunctionalTests.Should;
+using GVFS.FunctionalTests.Should;
 using NUnit.Framework;
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class ResetHardTests : GitRepoTests
     {
         private const string ResetHardCommand = "reset --hard";
 
-        public ResetHardTests() : base(enlistmentPerTest: true)
+        public ResetHardTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetMixedTests.cs

@@ -3,11 +3,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class ResetMixedTests : GitRepoTests
     {
-        public ResetMixedTests() : base(enlistmentPerTest: true)
+        public ResetMixedTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/ResetSoftTests.cs

@@ -2,11 +2,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class ResetSoftTests : GitRepoTests
     {
-        public ResetSoftTests() : base(enlistmentPerTest: true)
+        public ResetSoftTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/RmTests.cs

@@ -3,10 +3,11 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     public class RmTests : GitRepoTests
     {
-        public RmTests() : base(enlistmentPerTest: false)
+        public RmTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: false, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/StatusTests.cs

@@ -5,11 +5,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class StatusTests : GitRepoTests
     {
-        public StatusTests() : base(enlistmentPerTest: true)
+        public StatusTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }
 

GVFS/GVFS.FunctionalTests/Tests/GitCommands/UpdateIndexTests.cs

@@ -4,11 +4,12 @@
 
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
-    [TestFixture]
+    [TestFixtureSource(typeof(GitRepoTests), GitRepoTests.ValidateWorkingTree)]
     [Category(Categories.GitCommands)]
     public class UpdateIndexTests : GitRepoTests
     {
-        public UpdateIndexTests() : base(enlistmentPerTest: true)
+        public UpdateIndexTests(ValidateWorkingTreeOptions validateWorkingTree)
+            : base(enlistmentPerTest: true, validateWorkingTree: validateWorkingTree)
         {
         }