test without skippableTheory

.github/workflows/integration.yml

@@ -7,6 +7,7 @@ on:
       - '**/*.md'
     branches:
       - master
+      - ali/fix_ci_wind_tests
   pull_request:
   schedule:
     - cron: "0 1 * * *"

tests/NRedisStack.Tests/SkipIfRedisAttribute.cs

@@ -15,8 +15,7 @@ public enum Is
 }
 
 [AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
-[XunitTestCaseDiscoverer("NRedisStack.Tests.SkippableTheoryDiscoverer", "NRedisStack.Tests")]
-public class SkipIfRedisAttribute : SkippableTheoryAttribute
+public class SkipIfRedisAttribute : TheoryAttribute
 {
     private readonly string _targetVersion;
     private readonly Comparison _comparison;

tests/NRedisStack.Tests/SkippableTheoryDiscoverer.cs

@@ -1,61 +0,0 @@
-using Xunit.Sdk;
-
-namespace NRedisStack.Tests;
-
-// TODO(imalinovskiy): Remove this file once tests are migrated to Xunit v3
-
-/// Copyright (c) Andrew Arnott. All rights reserved.
-//  Licensed under the Microsoft Public License (Ms-PL).
-//  https://github.com/AArnott/Xunit.SkippableFact/blob/main/src/Xunit.SkippableFact/Sdk/SkippableTheoryDiscoverer.cs
-//  See https://github.com/AArnott/Xunit.SkippableFact/blob/main/LICENSE for full license information.
-
-using System.Collections.Generic;
-using Validation;
-using Xunit.Abstractions;
-
-/// <summary>
-/// Patched TestCase discoverer to support SkipIfRedisAttribute.
-/// </summary>
-public class SkippableTheoryDiscoverer : IXunitTestCaseDiscoverer
-{
-    /// <summary>
-    /// The diagnostic message sink provided to the constructor.
-    /// </summary>
-    private readonly IMessageSink diagnosticMessageSink;
-
-    /// <summary>
-    /// The complex theory discovery process that we wrap.
-    /// </summary>
-    private readonly TheoryDiscoverer theoryDiscoverer;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="SkippableTheoryDiscoverer"/> class.
-    /// </summary>
-    /// <param name="diagnosticMessageSink">The message sink used to send diagnostic messages.</param>
-    public SkippableTheoryDiscoverer(IMessageSink diagnosticMessageSink)
-    {
-        this.diagnosticMessageSink = diagnosticMessageSink;
-        this.theoryDiscoverer = new TheoryDiscoverer(diagnosticMessageSink);
-    }
-
-    /// <inheritdoc />
-    public virtual IEnumerable<IXunitTestCase> Discover(ITestFrameworkDiscoveryOptions discoveryOptions, ITestMethod testMethod, IAttributeInfo factAttribute)
-    {
-        Requires.NotNull(factAttribute, nameof(factAttribute));
-        string[] skippingExceptionNames = new[] { "Xunit.SkippableFact.SkipException" };
-        TestMethodDisplay defaultMethodDisplay = discoveryOptions.MethodDisplayOrDefault();
-
-        IEnumerable<IXunitTestCase>? basis = this.theoryDiscoverer.Discover(discoveryOptions, testMethod, factAttribute);
-        foreach (IXunitTestCase? testCase in basis)
-        {
-            if (testCase is XunitTheoryTestCase)
-            {
-                yield return new SkippableTheoryTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, discoveryOptions.MethodDisplayOptionsOrDefault(), testCase.TestMethod);
-            }
-            else
-            {
-                yield return new SkippableFactTestCase(skippingExceptionNames, this.diagnosticMessageSink, defaultMethodDisplay, discoveryOptions.MethodDisplayOptionsOrDefault(), testCase.TestMethod, testCase.TestMethodArguments);
-            }
-        }
-    }
-}