Run functional tests against Scalar-in-C

.github/workflows/continuous-integration.yml

@@ -6,6 +6,9 @@ on:
   pull_request:
     branches: [ main, releases/* ]
 
+env:
+  SCALAR_TEST_SKIP_VSTS_INFO: true
+
 jobs:
   validate_scalar:
     name: "CI"
@@ -15,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-16.04, ubuntu-18.04, ubuntu-20.04, windows-2019, macos-10.15]
-        features: [false, experimental]
+        features: [ignored]
 
     env:
       BUILD_FRAGMENT: bin/Release/netcoreapp3.1
@@ -94,7 +97,7 @@ jobs:
         Remove-Item 'C:\Program Files\Git' -Recurse -Force
         Write-Host 'Installing GitForWindows ...'
         $files = Get-ChildItem . -Recurse -File -Include 'Git-*.vfs.*.exe'
-        & $files[0].Fullname /DIR="C:\Program Files\Git" /NOICONS /COMPONENTS="ext,ext\shellhere,ext\guihere,assoc,assoc_sh" /GROUP="Git" /SP- /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /ALLOWDOWNGRADE=1 /LOG=install.log
+        & $files[0].Fullname /DIR="C:\Program Files\Git" /NOICONS /COMPONENTS="ext,ext\shellhere,ext\guihere,assoc,assoc_sh,scalar" /GROUP="Git" /SP- /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /ALLOWDOWNGRADE=1 /LOG=install.log
         Wait-Process $files[0].Basename
         Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\SOFTWARE\GitForWindows'
 
@@ -114,8 +117,7 @@ jobs:
         mkdir -p "$TRACE2_BASENAME/Perf"
         git version --build-options
         cd ../out
-        PATH="$PWD/Scalar/$BUILD_FRAGMENT:$PWD/Scalar.Service/$BUILD_FRAGMENT:$PATH"
-        Scalar.FunctionalTests/$BUILD_FRAGMENT/Scalar.FunctionalTests$BUILD_FILE_EXT --test-scalar-on-path --full-suite
+        Scalar.FunctionalTests/$BUILD_FRAGMENT/Scalar.FunctionalTests$BUILD_FILE_EXT --full-suite
 
     - id: trace2_zip_unix
       if: runner.os != 'Windows' && ( success() || failure() ) && ( steps.functional_test.conclusion == 'success' || steps.functional_test.conclusion == 'failure' )

Directory.Build.props

@@ -43,7 +43,7 @@
        VFS for Git (which is less flexible). Only update that version if we rely upon a
        new command-line interface in Git or if there is a truly broken interaction.
     -->
-    <GitPackageVersion>2.20210505.2</GitPackageVersion>
+    <GitPackageVersion>2.20210610.2</GitPackageVersion>
     <MinimumGitVersion>v2.25.0.vfs.1.1</MinimumGitVersion>
 
     <WatchmanPackageUrl>https://github.com/facebook/watchman/releases/download/v2020.08.03.00/watchman-v2020.08.03.00-windows.zip</WatchmanPackageUrl>

Scalar.Common/ScalarConstants.cs

@@ -228,8 +228,6 @@ public static class InstalledGit
 
         public static class VerbParameters
         {
-            public const string InternalUseOnly = "internal_use_only";
-
             public static class Maintenance
             {
                 public const string AllTasksName = "all";

Scalar.FunctionalTests/GlobalSetup.cs

@@ -18,23 +18,6 @@ public void RunBeforeAnyTests()
         [OneTimeTearDown]
         public void RunAfterAllTests()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                string serviceLogFolder = Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData),
-                    "Scalar",
-                    ScalarServiceProcess.TestServiceName,
-                    "Logs");
-
-                Console.WriteLine("Scalar.Service logs at '{0}' attached below.\n\n", serviceLogFolder);
-                foreach (string filename in TestResultsHelper.GetAllFilesInDirectory(serviceLogFolder))
-                {
-                    TestResultsHelper.OutputFileContents(filename);
-                }
-
-                ScalarServiceProcess.UninstallService();
-            }
-
             PrintTestCaseStats.PrintRunTimeStats();
         }
     }

Scalar.FunctionalTests/Program.cs

@@ -102,24 +102,6 @@ public static void Main(string[] args)
             RunBeforeAnyTests();
             Environment.ExitCode = runner.RunTests(includeCategories, excludeCategories);
 
-            try
-            {
-                // Shutdown the watchman server now that the tests are complete.
-                // Allows deleting the unwatched directories.
-                //
-                // Technically, we no longer try to start Watchman in the Functional Test Suite.
-                // However, on Linux (which doesn't currently support the Builtin FSMonitor), we
-                // allow the test startup to fallback and use Watchman (rather than failing the
-                // whole test).  So for now, we keep this code to shutdown the server and ignore
-                // any errors.
-                //
-                ProcessHelper.Run("watchman", "shutdown-server");
-            }
-            catch (Exception)
-            {
-                // This is non-critical, and watchman may not be installed.
-            }
-
             if (Debugger.IsAttached)
             {
                 Console.WriteLine("Tests completed. Press Enter to exit.");
@@ -129,10 +111,6 @@ public static void Main(string[] args)
 
         private static void RunBeforeAnyTests()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                ScalarServiceProcess.InstallService();
-            }
         }
     }
 }

Scalar.FunctionalTests/ScalarTestConfig.cs

@@ -76,10 +76,7 @@ public static string PathToScalar
         {
             get
             {
-                return
-                    TestScalarOnPath ?
-                    Properties.Settings.Default.PathToScalar :
-                    Path.Combine(Properties.Settings.Default.CurrentDirectory, Properties.Settings.Default.PathToScalar);
+                return Properties.Settings.Default.PathToScalar;
             }
         }
     }

Scalar.FunctionalTests/Settings.cs

@@ -31,7 +31,6 @@ public static class Default
             public static string ControlGitRepoRoot { get; set; }
             public static string EnlistmentRoot { get; set; }
             public static string PathToGitRoot { get; set; }
-            public static string PathToScalarService { get; set; }
             public static string BinaryFileNameExtension { get; set; }
 
             public static void Initialize()
@@ -50,7 +49,6 @@ public static void Initialize()
                     PathToBash = @"C:\Program Files\Git\bin\bash.exe";
 
                     ControlGitRepoRoot = @"C:\Repos\ScalarFunctionalTests\ControlRepo";
-                    PathToScalarService = @"Scalar.Service.exe";
                     BinaryFileNameExtension = ".exe";
                 }
                 else

Scalar.FunctionalTests/Tests/EnlistmentPerFixture/CloneTests.cs

@@ -12,38 +12,7 @@ namespace Scalar.FunctionalTests.Tests.EnlistmentPerFixture
     [TestFixture]
     public class CloneTests : TestsWithEnlistmentPerFixture
     {
-        private const int ScalarGenericError = 3;
-
-        [TestCase]
-        public void CloneInsideExistingEnlistment()
-        {
-            ProcessResult result = this.RunCloneCommand(
-                this.Enlistment.EnlistmentRoot,
-                Path.Combine("src", "scalar", "test1"));
-            result.ExitCode.ShouldEqual(ScalarGenericError);
-            result.Output.ShouldContain("You can't clone inside an existing Scalar repo");
-        }
-
-        [TestCase]
-        public void CloneInNonEmptyDirectory()
-        {
-            string newEnlistmentRoot = ScalarFunctionalTestEnlistment.GetUniqueEnlistmentRoot();
-            string newEnlistmentFilePath = Path.Combine(newEnlistmentRoot, "test2");
-
-            FileSystemRunner fileSystem = FileSystemRunner.DefaultRunner;
-            fileSystem.CreateDirectory(newEnlistmentRoot);
-            newEnlistmentRoot.ShouldBeADirectory(fileSystem);
-            fileSystem.CreateEmptyFile(newEnlistmentFilePath);
-            newEnlistmentFilePath.ShouldBeAFile(fileSystem);
-
-            ProcessResult result = this.RunCloneCommand(
-                Path.GetDirectoryName(this.Enlistment.EnlistmentRoot),
-                newEnlistmentRoot);
-            result.ExitCode.ShouldEqual(ScalarGenericError);
-            result.Output.ShouldContain("exists and is not empty");
-
-            RepositoryHelpers.DeleteTestDirectory(newEnlistmentRoot);
-        }
+        private const int ScalarGenericError = 128;
 
         [TestCase]
         public void CloneWithLocalCachePathWithinSrc()
@@ -55,7 +24,6 @@ public void CloneWithLocalCachePathWithinSrc()
                 newEnlistmentRoot,
                 $"--local-cache-path {localCachePath}");
             result.ExitCode.ShouldEqual(ScalarGenericError);
-            result.Output.ShouldContain("'--local-cache-path' cannot be inside the src folder");
 
             localCachePath = Path.Combine(newEnlistmentRoot, "SRC", ".scalarCache");
 
@@ -70,7 +38,6 @@ public void CloneWithLocalCachePathWithinSrc()
             else
             {
                 result.ExitCode.ShouldEqual(ScalarGenericError);
-                result.Output.ShouldContain("'--local-cache-path' cannot be inside the src folder");
             }
 
             RepositoryHelpers.DeleteTestDirectory(newEnlistmentRoot);

Scalar.FunctionalTests/Tests/EnlistmentPerFixture/DiagnoseTests.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 
 namespace Scalar.FunctionalTests.Tests.EnlistmentPerFixture
 {
@@ -22,6 +23,9 @@ public void DiagnoseProducesZipFile()
             string zipFilePath = files.First();
 
             zipFilePath.EndsWith(".zip").ShouldEqual(true);
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
+                !output.Contains(zipFilePath))
+                zipFilePath = zipFilePath.Replace('\\', '/');
             output.Contains(zipFilePath).ShouldEqual(true);
         }
     }