Merge branch 'develop' into bug-1681

ThreeMammals · Sep 25, 2023 · 2c163a5 · 2c163a5
2 parents 92cabfe + 8b89257
commit 2c163a5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/test/Ocelot.AcceptanceTests/ConfigurationReloadTests.cs b/test/Ocelot.AcceptanceTests/ConfigurationReloadTests.cs
@@ -1,8 +1,9 @@
-using Ocelot.Configuration.ChangeTracking;
+using Ocelot.Configuration.ChangeTracking;
 using Ocelot.Configuration.File;
 
 namespace Ocelot.AcceptanceTests
 {
+    [Collection(nameof(SequentialTests))]
     public sealed class ConfigurationReloadTests : IDisposable
     {
         private readonly FileConfiguration _initialConfig;

diff --git a/test/Ocelot.AcceptanceTests/SequentialTests.cs b/test/Ocelot.AcceptanceTests/SequentialTests.cs
@@ -0,0 +1,11 @@
+using Xunit;
+
+namespace Ocelot.AcceptanceTests;
+
+/// <summary>
+/// Apply <see cref="CollectionAttribute"/> to classes to disable parallelization.
+/// </summary>
+[CollectionDefinition(nameof(SequentialTests), DisableParallelization = true)]
+public class SequentialTests
+{
+}