Merge pull request #32: Enable an initial set of functional tests and…

… standup Mac Functional Test Pipeline

 - Add 'SupportsGVFSService' under construction flag, and only attempt to register/unregister when it's true
  - Add a new 'NeedsUpdatesForNonVirtualizedMode' category to functional tests
  - Update functional tests to run all tests not flagged with 'NeedsUpdatesForNonVirtualizedMode'
  - Update pipelines to run Mac functional tests

.azure-pipelines/pull-request.yml

@@ -21,8 +21,22 @@ jobs:
     steps:
     - template: templates/windows-build-and-unit-test.yml
 
-  - job: macOS
+  - job: macOS_Build_and_UnitTests
+    variables:
+      platformFriendlyName: macOS
     pool:
       name: 'Hosted macOS'
     steps:
     - template: templates/macos-build-and-unit-test.yml
+
+  - job: macOS_FunctionalTests
+    variables:
+      platformFriendlyName: macOS
+    timeoutInMinutes: 30
+    pool:
+      name: 'Hosted macOS'
+    dependsOn: macOS_Build_and_UnitTests
+    condition: succeeded()
+    steps:
+      - checkout: none # Use the drop from Build_macOS job
+      - template: templates/macos-functional-test.yml

.azure-pipelines/templates/macos-build-and-unit-test.yml

@@ -25,14 +25,14 @@ steps:
       publishRunAttachments: true
     condition: succeededOrFailed()
 
-  #- script: Scripts/Mac/CI/CreateBuildDrop.sh $(configuration) $(Build.ArtifactStagingDirectory)/Tests
-  #  displayName: Create functional test drop.
+  - script: Scripts/Mac/CI/CreateBuildDrop.sh $(configuration) $(Build.ArtifactStagingDirectory)/Tests
+    displayName: Create functional test drop.
 
-  #- task: PublishBuildArtifacts@1
-  #  displayName: Publish functional test drop artifact.
-  #  inputs:
-  #    pathtoPublish: $(Build.ArtifactStagingDirectory)/Tests
-  #    artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
-  #    parallel: true
-  #    parallelCount: 8
-  #  condition: succeededOrFailed()
+  - task: PublishBuildArtifacts@1
+    displayName: Publish functional test drop artifact.
+    inputs:
+      pathtoPublish: $(Build.ArtifactStagingDirectory)/Tests
+      artifactName: "FunctionalTests_$(platformFriendlyName)_$(configuration)"
+      parallel: true
+      parallelCount: 8
+    condition: succeededOrFailed()

.azure-pipelines/templates/macos-functional-test.yml

@@ -45,12 +45,6 @@ steps:
     displayName: Cleanup
     condition: always()
 
-  - task: PublishBuildArtifacts@1
-    displayName: Publish kext logs
-    inputs:
-      pathtoPublish: $(Build.ArtifactStagingDirectory)/kext.log
-      artifactName: kext.log
-
   - bash: sudo rm -rf $(Build.BinariesDirectory)/FunctionalTests_$(platformFriendlyName)_$(configuration)
     displayName: Cleanup phase 2
     condition: always()

GVFS/GVFS.Common/GVFSPlatform.cs

@@ -185,16 +185,19 @@ public class UnderConstructionFlags
             public UnderConstructionFlags(
                 bool supportsGVFSUpgrade = true,
                 bool supportsGVFSConfig = true,
-                bool supportsNuGetEncryption = true)
+                bool supportsNuGetEncryption = true,
+                bool supportsGVFSService = false)
             {
                 this.SupportsGVFSUpgrade = supportsGVFSUpgrade;
                 this.SupportsGVFSConfig = supportsGVFSConfig;
                 this.SupportsNuGetEncryption = supportsNuGetEncryption;
+                this.SupportsGVFSService = supportsGVFSService;
             }
 
             public bool SupportsGVFSUpgrade { get; }
             public bool SupportsGVFSConfig { get; }
             public bool SupportsNuGetEncryption { get; }
+            public bool SupportsGVFSService { get; }
         }
     }
 }

GVFS/GVFS.FunctionalTests/Categories.cs

@@ -9,6 +9,8 @@ public static class Categories
         public const string WindowsOnly = "WindowsOnly";
         public const string MacOnly = "MacOnly";
 
+        public const string NeedsUpdatesForNonVirtualizedMode = "NeedsUpdatesForNonVirtualizedMode";
+
         public static class MacTODO
         {
             // Tests that require #360 (detecting/handling new empty folders)

GVFS/GVFS.FunctionalTests/Program.cs

@@ -109,6 +109,12 @@ public static void Main(string[] args)
                 excludeCategories.Add(Categories.MacOnly);
             }
 
+            // For now, run all of the tests not flagged as needing to be updated to work
+            // with the non-virtualized solution
+            includeCategories.Clear();
+            excludeCategories.Clear();
+            excludeCategories.Add(Categories.NeedsUpdatesForNonVirtualizedMode);
+
             GVFSTestConfig.DotGVFSRoot = RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? ".vfsforgit" : ".gvfs";
 
             GVFSTestConfig.RepoToClone =

GVFS/GVFS.FunctionalTests/Tests/DiskLayoutVersionTests.cs

@@ -8,6 +8,7 @@ namespace GVFS.FunctionalTests.Tests
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class DiskLayoutVersionTests : TestsWithEnlistmentPerTestCase
     {
         private const int WindowsCurrentDiskLayoutMajorVersion = 0;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/CacheServerTests.cs

@@ -6,6 +6,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class CacheServerTests : TestsWithEnlistmentPerFixture
     {
         private const string CustomUrl = "https://myCache";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/DiagnoseTests.cs

@@ -10,6 +10,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
     [TestFixture]
     [NonParallelizable]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class DiagnoseTests : TestsWithEnlistmentPerFixture
     {
         private FileSystemRunner fileSystem;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GVFSUpgradeReminderTests.cs

@@ -14,6 +14,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
     [NonParallelizable]
     [Category(Categories.ExtraCoverage)]
     [Category(Categories.WindowsOnly)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class UpgradeReminderTests : TestsWithEnlistmentPerFixture
     {
         private const string HighestAvailableVersionFileName = "HighestAvailableVersion";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitCorruptObjectTests.cs

@@ -11,6 +11,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class GitCorruptObjectTests : TestsWithEnlistmentPerFixture
     {
         private FileSystemRunner fileSystem;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/GitMoveRenameTests.cs

@@ -12,6 +12,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixtureSource(typeof(FileSystemRunner), nameof(FileSystemRunner.Runners))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class GitMoveRenameTests : TestsWithEnlistmentPerFixture
     {
         private string testFileContents = "0123456789";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/MountTests.cs

@@ -14,6 +14,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class MountTests : TestsWithEnlistmentPerFixture
     {
         private const int GVFSGenericError = 3;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/PackfileMaintenanceStepTests.cs

@@ -9,6 +9,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class PackfileMaintenanceStepTests : TestsWithEnlistmentPerFixture
     {
         private FileSystemRunner fileSystem;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/PrefetchVerbTests.cs

@@ -12,6 +12,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
     [NonParallelizable]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class PrefetchVerbTests : TestsWithEnlistmentPerFixture
     {
         private const string PrefetchCommitsAndTreesLock = "prefetch-commits-trees.lock";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/PrefetchVerbWithoutSharedCacheTests.cs

@@ -14,6 +14,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
     [Category(Categories.MacTODO.TestNeedsToLockFile)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class PrefetchVerbWithoutSharedCacheTests : TestsWithEnlistmentPerFixture
     {
         private const string PrefetchPackPrefix = "prefetch";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/SparseTests.cs

@@ -10,6 +10,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class SparseTests : TestsWithEnlistmentPerFixture
     {
         private FileSystemRunner fileSystem = new SystemIORunner();

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/StatusVerbTests.cs

@@ -7,6 +7,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class StatusVerbTests : TestsWithEnlistmentPerFixture
     {
         [TestCase]

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/SymbolicLinkTests.cs

@@ -9,6 +9,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     // MacOnly until issue #297 (add SymLink support for Windows) is complete
     [Category(Categories.MacOnly)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     [TestFixture]
     public class SymbolicLinkTests : TestsWithEnlistmentPerFixture
     {

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/UnmountTests.cs

@@ -10,6 +10,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class UnmountTests : TestsWithEnlistmentPerFixture
     {
         private FileSystemRunner fileSystem;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/CaseOnlyFolderRenameTests.cs

@@ -8,6 +8,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerTestCase
 {
     [TestFixture]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class CaseOnlyFolderRenameTests : TestsWithEnlistmentPerTestCase
     {
         private FileSystemRunner fileSystem;

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/LooseObjectStepTests.cs

@@ -10,6 +10,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerTestCase
 {
     [TestFixture]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class LooseObjectStepTests : TestsWithEnlistmentPerTestCase
     {
         private const string TempPackFolder = "tempPacks";

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerTestCase/RepairTests.cs

@@ -11,6 +11,7 @@ namespace GVFS.FunctionalTests.Tests.EnlistmentPerTestCase
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class RepairTests : TestsWithEnlistmentPerTestCase
     {
         [TestCase]

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

@@ -8,6 +8,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class AddStageTests : GitRepoTests
     {
         public AddStageTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class CherryPickConflictTests : GitRepoTests
     {
         public CherryPickConflictTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -6,6 +6,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class DeleteEmptyFolderTests : GitRepoTests
     {
         public DeleteEmptyFolderTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class EnumerationMergeTest : GitRepoTests
     {
         // Commit that found GvFlt Bug 12258777: Entries are sometimes skipped during

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

@@ -11,6 +11,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class GitCommandsTests : GitRepoTests
     {
         public const string TopLevelFolderToCreate = "level1";

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

@@ -7,6 +7,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class MergeConflictTests : GitRepoTests
     {
         public MergeConflictTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class RebaseConflictTests : GitRepoTests
     {
         public RebaseConflictTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class RebaseTests : GitRepoTests
     {
         public RebaseTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -6,6 +6,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ResetHardTests : GitRepoTests
     {
         private const string ResetHardCommand = "reset --hard";

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

@@ -6,6 +6,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ResetMixedTests : GitRepoTests
     {
         public ResetMixedTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ResetSoftTests : GitRepoTests
     {
         public ResetSoftTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -11,7 +11,8 @@
 namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
-    [Category(Categories.GitCommands)]
+    [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class StatusTests : GitRepoTests
     {
         public StatusTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

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

@@ -7,6 +7,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class UpdateIndexTests : GitRepoTests
     {
         public UpdateIndexTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

GVFS/GVFS.FunctionalTests/Tests/GitCommands/UpdateRefTests.cs

@@ -5,6 +5,7 @@ namespace GVFS.FunctionalTests.Tests.GitCommands
 {
     [TestFixtureSource(typeof(GitRepoTests), nameof(GitRepoTests.ValidateWorkingTree))]
     [Category(Categories.GitCommands)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class UpdateRefTests : GitRepoTests
     {
         public UpdateRefTests(Settings.ValidateWorkingTreeMode validateWorkingTree)

GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/ConfigVerbTests.cs

@@ -11,6 +11,7 @@ namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
     [Category(Categories.MacTODO.NeedsGVFSConfig)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ConfigVerbTests : TestsWithMultiEnlistment
     {
         private const string IntegerSettingKey = "functionalTest_Integer";

GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/ServiceVerbTests.cs

@@ -8,6 +8,7 @@ namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
     [NonParallelizable]
     [Category(Categories.ExtraCoverage)]
     [Category(Categories.MacTODO.NeedsServiceVerb)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class ServiceVerbTests : TestsWithMultiEnlistment
     {
         private static readonly string[] EmptyRepoList = new string[] { };

GVFS/GVFS.FunctionalTests/Tests/MultiEnlistmentTests/SharedCacheTests.cs

@@ -15,6 +15,7 @@ namespace GVFS.FunctionalTests.Tests.MultiEnlistmentTests
 {
     [TestFixture]
     [Category(Categories.ExtraCoverage)]
+    [Category(Categories.NeedsUpdatesForNonVirtualizedMode)]
     public class SharedCacheTests : TestsWithMultiEnlistment
     {
         private const string WellKnownFile = "Readme.md";

GVFS/GVFS/CommandLine/MountVerb.cs

@@ -173,7 +173,7 @@ protected override void Execute(GVFSEnlistment enlistment)
                     this.ReportErrorAndExit(tracer, errorMessage);
                 }
 
-                if (!this.Unattended)
+                if (!this.Unattended && GVFSPlatform.Instance.UnderConstruction.SupportsGVFSService)
                 {
                     tracer.RelatedInfo($"{nameof(this.Execute)}: Registering for automount");
 

GVFS/GVFS/CommandLine/UnmountVerb.cs

@@ -51,7 +51,7 @@ public override void Execute()
                 this.ReportErrorAndExit(errorMessage);
             }
 
-            if (!this.Unattended && !this.SkipUnregister)
+            if (!this.Unattended && !this.SkipUnregister && GVFSPlatform.Instance.UnderConstruction.SupportsGVFSService)
             {
                 if (!this.ShowStatusWhileRunning(
                     () => { return this.UnregisterRepo(root, out errorMessage); },