Improvements of test framework

- Ignoring on Github actions improved
- fixed firebird25 connection and added new for firebird30
- Added some versions to be used in test requirements

Author: alex-kulakov

Orm/Xtensive.Orm.Tests.Framework/NUnitFrameworkExtensions/IgnoreIfGithubActionsAttribute.cs

@@ -4,44 +4,142 @@
 namespace Xtensive.Orm.Tests
 {
   /// <summary>
-  /// Ignores test if test run is in Github Action environment
+  /// Helps to ignore flaky tests
   /// </summary>
-  public sealed class IgnoreIfGithubActionsAttribute : NUnitTestCustomAttribute
+  public sealed class IgnoreOnGithubActionsIfFailedAttribute : IgnoreIfGithubActionAttributeBase
   {
-    public string Reason { get; private set; }
+    protected override bool CheckIfFailed => true;
 
-    public StorageProvider? Provider { get; private set; }
+    public IgnoreOnGithubActionsIfFailedAttribute(StorageProvider provider, GithubActionsEvents triggerEvent, string reason)
+      : base((StorageProvider?) provider, triggerEvent, reason)
+    {
+    }
 
-    protected override void OnBeforeTestCheck(ITest test)
+
+    public IgnoreOnGithubActionsIfFailedAttribute(GithubActionsEvents triggerEvent, string reason)
+      : base(null, triggerEvent, reason)
+    {
+    }
+
+    public IgnoreOnGithubActionsIfFailedAttribute(GithubActionsEvents triggerEvent)
+      : base(null, triggerEvent, null)
+    {
+    }
+
+    public IgnoreOnGithubActionsIfFailedAttribute(StorageProvider provider, string reason)
+      : base(provider, null, reason)
+    {
+    }
+
+    public IgnoreOnGithubActionsIfFailedAttribute(StorageProvider provider)
+       : base(provider, null, null)
+    {
+    }
+
+    public IgnoreOnGithubActionsIfFailedAttribute(string reason)
+      : base(null, null, reason)
+    {
+    }
+
+    public IgnoreOnGithubActionsIfFailedAttribute()
+      : base(null, null, null)
+    {
+    }
+  }
+
+  /// <summary>
+  /// Helps to ignore always failing tests.
+  /// </summary>
+  public sealed class IgnoreIfGithubActionsAttribute : IgnoreIfGithubActionAttributeBase
+  {
+    protected override bool CheckIfFailed => false;
+
+
+    public IgnoreIfGithubActionsAttribute(StorageProvider provider, GithubActionsEvents triggerEvent, string reason)
+      : base((StorageProvider?) provider, triggerEvent, reason)
+    {
+    }
+
+
+    public IgnoreIfGithubActionsAttribute(GithubActionsEvents triggerEvent, string reason)
+      : base(null, null, reason)
+    {
+    }
+
+    public IgnoreIfGithubActionsAttribute(GithubActionsEvents triggerEvent)
+      : base(null, triggerEvent, null)
     {
-      if (TestInfo.IsGitHubActions) {
-        if (Provider.HasValue && !StorageProviderInfo.Instance.CheckProviderIs(Provider.Value))
-          return;
-        throw new IgnoreException(
-          string.IsNullOrEmpty(Reason)
-            ? "Ignored due to run on Github Actions. Test is always failing."
-            : $"Ignored due to run on Github Actions. {Reason}");
-      }
     }
 
     public IgnoreIfGithubActionsAttribute(StorageProvider provider, string reason)
+      : base(provider, null, reason)
     {
-      Reason = reason;
-      Provider = provider;
     }
 
     public IgnoreIfGithubActionsAttribute(StorageProvider provider)
+       : base(provider, null, null)
     {
-      Provider = provider;
     }
 
     public IgnoreIfGithubActionsAttribute(string reason)
+      : base(null, null, reason)
     {
-      Reason = reason;
     }
 
     public IgnoreIfGithubActionsAttribute()
+      : base(null, null, null)
+    {
+    }
+  }
+
+  public abstract class IgnoreIfGithubActionAttributeBase : NUnitTestCustomAttribute
+  {
+    public string Reason { get; private set; }
+
+    public StorageProvider? Provider { get; private set; }
+
+    public GithubActionsEvents? TriggerEvent { get; private set; }
+
+    protected abstract bool CheckIfFailed { get; }
+
+    protected override void OnBeforeTestCheck(ITest test)
     {
+      if (TestInfo.IsGithubActions && !CheckIfFailed) {
+        Check();
+      }
+    }
+
+    protected override void OnAfterTestCheck(ITest test)
+    {
+      var resultOutcome = TestContext.CurrentContext.Result.Outcome;
+      if (TestInfo.IsGithubActions && CheckIfFailed
+        && (resultOutcome == ResultState.Failure || resultOutcome == ResultState.Error)) {
+        Check();
+      }
+    }
+
+    private void Check()
+    {
+      if (Provider.HasValue && !StorageProviderInfo.Instance.CheckProviderIs(Provider.Value)) {
+        return;
+      }
+
+      if (TriggerEvent.HasValue && TriggerEvent != TestInfo.GithubActionTrigger) {
+        return;
+      }
+
+      throw new IgnoreException(
+        string.IsNullOrEmpty(Reason)
+          ? $"Ignored due to run on Github Actions. {(CheckIfFailed ? "Flaky tests failed this time" : "Test is always failing")}."
+          : $"Ignored due to run on Github Actions. {Reason}");
+    }
+
+
+    protected IgnoreIfGithubActionAttributeBase(StorageProvider? provider, GithubActionsEvents? triggerEvent, string reason)
+    {
+      Provider = provider;
+      TriggerEvent = triggerEvent;
+      Reason = reason;
     }
   }
 }

Orm/Xtensive.Orm.Tests.Framework/NUnitFrameworkExtensions/RequireProviderAttributes.cs

@@ -1,5 +1,4 @@
 using System;
-using NUnit.Framework;
 using NUnit.Framework.Interfaces;
 
 namespace Xtensive.Orm.Tests

Orm/Xtensive.Orm.Tests.Framework/Orm.config

@@ -67,7 +67,10 @@
             connectionUrl="mysql://dotest:dotest@localhost:3356/dotest" />
 
     <domain name="firebird25" provider="firebird"
-            connectionString="User=dotest;Password=dotest;Database=dotest;DataSource=localhost;Port=3050;Dialect=3;Charset=UTF8;Role=;Connection lifetime=15;Pooling=true;MinPoolSize=0;MaxPoolSize=50;Packet Size=8192;ServerType=0" />
+            connectionUrl="firebird://dotest:dotest@localhost:3050/dotest" />
+
+    <domain name="firebird30" provider="firebird"
+        connectionUrl="firebird://dotest:dotest@localhost:3053/dotest" />
 
     <domain name="sqlite3"
             connectionUrl="sqlite:///DO-Tests.db3" />
@@ -136,7 +139,10 @@
 
     <domain name="firebird25cs" provider="firebird"
             connectionString="User=dotest;Password=dotest;Database=dotest;DataSource=localhost;Port=3050;Dialect=3;Charset=UTF8;Role=;Connection lifetime=15;Pooling=true;MinPoolSize=0;MaxPoolSize=50;Packet Size=8192;ServerType=0" />
-            
+
+    <domain name="firebird30cs" provider="firebird"
+            connectionString="User=dotest;Password=dotest;Database=dotest;DataSource=localhost;Port=3053;Dialect=3;Charset=UTF8;Role=;Connection lifetime=15;Pooling=true;MinPoolSize=0;MaxPoolSize=50;Packet Size=8192;ServerType=0" />
+
     <domain name="sqlite3cs" provider="sqlite"
             connectionString="Data Source=DO-Tests.db3" />
   </domains>

Orm/Xtensive.Orm.Tests.Framework/StorageProviderVersion.cs

@@ -36,5 +36,8 @@ public static class StorageProviderVersion
 
     public static Version MySql55 = new Version(5, 5);
     public static Version MySql56 = new Version(5, 6);
+
+    public static Version Firebird25 = new Version(2, 5);
+    public static Version Firebird30 = new Version(3, 0);
   }
 }

Orm/Xtensive.Orm.Tests.Framework/TestInfo.cs

@@ -1,4 +1,4 @@
-// Copyright (C) 20082025 Xtensive LLC.
+// Copyright (C) 2008-2025 Xtensive LLC.
 // This code is distributed under MIT license terms.
 // See the License.txt file in the project root for more information.
 // Created by: Alex Yakunin
@@ -13,11 +13,28 @@
 
 namespace Xtensive.Orm.Tests
 {
+  /// <summary>
+  /// Defines subset of Github Actions events
+  /// which may trigger test runs
+  /// </summary>
+  public enum GithubActionsEvents
+  {
+    PullRequest,
+    WorkflowDispatch,
+    WorkflowCall,
+    Push,
+    Schedule
+  }
+
   /// <summary>
   /// Provides various info related to the current test.
   /// </summary>
   public static class TestInfo
   {
+    private static readonly bool isBuildServer;
+    private static readonly bool isGithubActions;
+    private static readonly GithubActionsEvents? githubActionsTriggeredBy;
+
     /// <summary>
     /// <see langword="true"/>, if performance test is running (i.e. a test with
     /// "Performance" category).
@@ -39,24 +56,53 @@ public static class TestInfo
     /// <summary>
     /// Gets a value indicating whether test is running under build server.
     /// </summary>
-    public static bool IsBuildServer => Environment.GetEnvironmentVariable("TEAMCITY_VERSION") != null;
+    public static bool IsBuildServer => isBuildServer;
 
     /// <summary>
     /// Gets a value indicating whether test is running within GitHub Actions environment.
     /// </summary>
-    public static bool IsGitHubActions => Environment.GetEnvironmentVariable("GITHUB_WORKSPACE") != null;
+    public static bool IsGithubActions => isGithubActions;
+
+    /// <summary>
+    /// Gets the event that triggered test run within Github Actions environment.
+    /// </summary>
+    public static GithubActionsEvents? GithubActionTrigger => githubActionsTriggeredBy;
 
     private static IEnumerable<T> GetMethodAttributes<T>() where T : Attribute
     {
       var stackFrames = new StackTrace().GetFrames();
       foreach (var frame in stackFrames) {
         var method = frame.GetMethod();
         if (method.GetCustomAttribute<TestAttribute>(false) == null)
+
+
           continue;
         foreach (var ca in method.GetCustomAttributes<T>(false))
           yield return ca;
+
       }
       yield break;
     }
+
+    private static GithubActionsEvents? TryParseGithubEventName(string varValue)
+    {
+      return varValue switch {
+        "pull_request" => GithubActionsEvents.PullRequest,
+        "pull_request_comment" => GithubActionsEvents.PullRequest,
+        "pull_request_review" => GithubActionsEvents.PullRequest,
+        "pull_request_target" => GithubActionsEvents.PullRequest,
+        "workflow_dispatch" => GithubActionsEvents.WorkflowDispatch,
+        "workflow_call" => GithubActionsEvents.WorkflowCall,
+        "schedule" => GithubActionsEvents.Schedule,
+        _ => null
+      };
+    }
+
+    static TestInfo()
+    {
+      isBuildServer = Environment.GetEnvironmentVariable("TEAMCITY_VERSION") != null;
+      isGithubActions = Environment.GetEnvironmentVariable("GITHUB_WORKSPACE") != null;
+      githubActionsTriggeredBy = TryParseGithubEventName(Environment.GetEnvironmentVariable("GITHUB_EVENT_NAME"));
+    }
   }
 }