Merge pull request #1997 from tyrielv/tyrielv/remove-extra-coverage

Remove ExtraCoverage category — run all functional tests in CI

Author: tyrielv

.github/workflows/functional-tests.yaml

@@ -63,7 +63,7 @@ jobs:
       matrix:
         configuration: [ Debug, Release ]
         architecture: [ x86_64, arm64 ]
-        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9] # 10 parallel jobs to speed up the tests
+        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11] # 12 parallel jobs to speed up the tests
       fail-fast: false # most failures are flaky tests, no need to stop the other jobs from succeeding
 
     steps:
@@ -142,6 +142,17 @@ jobs:
         run-id: ${{ inputs.vfs_run_id || github.run_id }}
         github-token: ${{ secrets.vfs_token || github.token }}
 
+    - name: Download FastFetch drop
+      if: steps.skip.outputs.result != 'true'
+      continue-on-error: true
+      uses: actions/download-artifact@v8
+      with:
+        name: FastFetch_${{ matrix.configuration }}
+        path: ft
+        repository: ${{ inputs.vfs_repository || github.repository }}
+        run-id: ${{ inputs.vfs_run_id || github.run_id }}
+        github-token: ${{ secrets.vfs_token || github.token }}
+
     - name: ProjFS details (pre-install)
       if: steps.skip.outputs.result != 'true'
       shell: cmd
@@ -193,7 +204,7 @@ jobs:
       run: |
         SET PATH=C:\Program Files\VFS for Git;%PATH%
         SET GIT_TRACE2_PERF=C:\temp\git-trace2.log
-        ft\GVFS.FunctionalTests.exe /result:TestResult.xml --ci --slice=${{ matrix.nr }},10
+        ft\GVFS.FunctionalTests.exe /result:TestResult.xml --ci --slice=${{ matrix.nr }},12
 
     - name: Upload functional test results
       if: always() && steps.skip.outputs.result != 'true'

AuthoringTests.md

@@ -40,10 +40,9 @@ The functional tests are built on NUnit 3, which is available as a set of NuGet
 
 #### Selecting Which Tests are Run
 
-By default, the functional tests run a subset of tests as a quick smoke test for developers.  There are three mutually exclusive arguments that can be passed to the functional tests to change this behavior:
+By default, the functional tests run all tests.  There are two mutually exclusive arguments that can be passed to the functional tests to change this behavior:
 
-- `--full-suite`: Run all configurations of all functional tests
-- `--extra-only`: Run only those tests marked as "ExtraCoverage" (i.e. the tests that are not run by default)
+- `--full-suite`: Run all configurations of all functional tests (tests all `ValidateWorkingTreeMode` values and all `FileSystemRunner` types)
 - `--windows-only`: Run only the tests marked as being Windows specific
 
 **NOTE** `Scripts\RunFunctionalTests.bat` already uses some of these arguments.  If you run the tests using `RunFunctionalTests.bat` consider locally modifying the script rather than passing these flags as arguments to the script.

GVFS/GVFS.Common/Database/SqliteDatabase.cs

@@ -21,7 +21,7 @@ public static bool HasIssue(string databasePath, PhysicalFileSystem filesystem,
 
                 try
                 {
-                    string sqliteConnectionString = CreateConnectionString(databasePath);
+                    string sqliteConnectionString = $"data source={databasePath};Pooling=False";
                     using (SqliteConnection integrityConnection = new SqliteConnection(sqliteConnectionString))
                     {
                         integrityConnection.Open();

GVFS/GVFS.Common/Database/SqliteErrorCodes.cs

@@ -0,0 +1,15 @@
+namespace GVFS.Common.Database
+{
+    /// <summary>
+    /// SQLite result codes used for error classification.
+    /// See https://www.sqlite.org/rescode.html
+    /// </summary>
+    public static class SqliteErrorCodes
+    {
+        /// <summary>SQLITE_CORRUPT (11) — database disk image is malformed</summary>
+        public const int Corrupt = 11;
+
+        /// <summary>SQLITE_NOTADB (26) — file is not a database</summary>
+        public const int NotADatabase = 26;
+    }
+}

GVFS/GVFS.FunctionalTests/Categories.cs

@@ -2,9 +2,8 @@
 {
     public static class Categories
     {
-        public const string ExtraCoverage = "ExtraCoverage";
         public const string FastFetch = "FastFetch";
         public const string GitCommands = "GitCommands";
-        public const string NeedsReactionInCI = "NeedsReactionInCI";
+        public const string SkipInCI = "SkipInCI";
     }
 }

GVFS/GVFS.FunctionalTests/Program.cs

@@ -84,21 +84,11 @@ public static void Main(string[] args)
                         new object[] { validateMode },
                     };
 
-                if (runner.HasCustomArg("--extra-only"))
-                {
-                    Console.WriteLine("Running only the tests marked as ExtraCoverage");
-                    includeCategories.Add(Categories.ExtraCoverage);
-                }
-                else
-                {
-                    excludeCategories.Add(Categories.ExtraCoverage);
-                }
-
                 // If we're running in CI exclude tests that are currently
                 // flakey or broken when run in a CI environment.
                 if (runner.HasCustomArg("--ci"))
                 {
-                    excludeCategories.Add(Categories.NeedsReactionInCI);
+                    excludeCategories.Add(Categories.SkipInCI);
                 }
 
                 GVFSTestConfig.FileSystemRunners = FileSystemRunners.FileSystemRunner.DefaultRunners;

GVFS/GVFS.FunctionalTests/SkipInCIAttribute.cs

@@ -0,0 +1,20 @@
+using NUnit.Framework;
+
+namespace GVFS.FunctionalTests
+{
+    /// <summary>
+    /// Marks a test or fixture to be skipped in CI (when --ci is passed).
+    /// Use the <see cref="Reason"/> property to document why the test is
+    /// skipped so it can be triaged and fixed later.
+    /// </summary>
+    public class SkipInCIAttribute : CategoryAttribute
+    {
+        public SkipInCIAttribute(string reason)
+            : base("SkipInCI")
+        {
+            this.Reason = reason;
+        }
+
+        public string Reason { get; }
+    }
+}

GVFS/GVFS.FunctionalTests/Tests/DiskLayoutVersionTests.cs

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

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

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

GVFS/GVFS.FunctionalTests/Tests/EnlistmentPerFixture/DehydrateTests.cs

@@ -14,7 +14,7 @@
 namespace GVFS.FunctionalTests.Tests.EnlistmentPerFixture
 {
     [TestFixture]
-    [Category(Categories.ExtraCoverage)]
+    [SkipInCI("Atrophied: folder dehydrate behavior changed, expectations need updating")]
     public class DehydrateTests : TestsWithEnlistmentPerFixture
     {
         private const string FolderDehydrateSuccessfulMessage = "folder dehydrate successful.";