Merge pull request #537 from Particular/fix-flaky-test-3.4

Fix flaky test 3.4

Author: awright18

src/NServiceBus.TransactionalSession.AcceptanceTests/When_using_outbox_and_audit_enabled.cs

@@ -23,7 +23,8 @@ public async Task Should_not_audit_the_control_message(bool commitHappensAfterCo
                 var options = new CustomTestingPersistenceOpenSessionOptions
                 {
                     TransactionCommitTaskCompletionSource = ctx.TransactionCommitTaskCompletionSource,
-                    CommitDelayIncrement = TimeSpan.FromSeconds(500)
+                    CommitDelayIncrement = TimeSpan.FromSeconds(500),
+                    MaximumCommitDuration = TimeSpan.FromSeconds(2)
                 };
 
                 if (!commitHappensAfterControlMessage)
@@ -48,6 +49,7 @@ public async Task Should_not_audit_the_control_message(bool commitHappensAfterCo
     class Context : TransactionalSessionTestContext
     {
         public bool SampleMessageAudited { get; set; }
+        public bool CompleteTestMessageAudited { get; set; }
         public bool ControlMessageWasAudited { get; set; }
         public bool TestComplete { get; set; }
 
@@ -117,6 +119,11 @@ public override Task Invoke(ITransportReceiveContext context, Func<Task> next)
                 }
 
                 if (messageType.Contains(nameof(CompleteTestMessage)))
+                {
+                    testContext.CompleteTestMessageAudited = true;
+                }
+
+                if (testContext.SampleMessageAudited && testContext.CompleteTestMessageAudited)
                 {
                     testContext.TestComplete = true;
                 }

src/NServiceBus.TransactionalSession.Tests/OpenSessionOptionsTests.cs

@@ -0,0 +1,34 @@
+namespace NServiceBus.TransactionalSession.Tests;
+
+using System;
+using NUnit.Framework;
+
+public class OpenSessionOptionsTests
+{
+    [Test]
+    public void Should_not_throw_exception_when_commit_delay_increment_is_greater_than_zero() =>
+        Assert.DoesNotThrow(() =>
+        {
+            var options = new CustomTestingPersistenceOpenSessionOptions
+            {
+                CommitDelayIncrement = TimeSpan.FromTicks(1),
+                MaximumCommitDuration = TimeSpan.FromSeconds(8)
+            };
+        });
+
+    [Test]
+    [TestCase(-1)]
+    [TestCase(0)]
+    public void Should_throw_exception_when_commit_delay_increment_is_less_than_or_equal_to_zero(int commitDelayIncrement) =>
+        Assert.Throws<ArgumentOutOfRangeException>(() =>
+        {
+            var options = new CustomTestingPersistenceOpenSessionOptions
+            {
+                CommitDelayIncrement = TimeSpan.FromSeconds(commitDelayIncrement),
+                MaximumCommitDuration = TimeSpan.FromSeconds(8)
+            };
+        });
+
+    class CustomTestingPersistenceOpenSessionOptions : OpenSessionOptions;
+}
+

src/NServiceBus.TransactionalSession/OpenSessionOptions.cs

@@ -37,8 +37,17 @@ public abstract class OpenSessionOptions
     /// <summary>
     /// The time increment used to delay the commit of the transactional session when the outbox record is not yet in the storage.
     /// </summary>
-    /// <remarks>Defaults to <code>TimeSpan.FromSeconds(2)</code></remarks>
-    public TimeSpan CommitDelayIncrement { get; set; } = TimeSpan.FromSeconds(2);
+    /// <remarks>Defaults to <code>TimeSpan.FromSeconds(2)</code>. Value must be greater than <code>TimeSpan.Zero</code>.</remarks>
+    public TimeSpan CommitDelayIncrement
+    {
+        get => commitDelayIncrement;
+        set
+        {
+            ArgumentOutOfRangeException.ThrowIfLessThanOrEqual(value, TimeSpan.Zero, nameof(CommitDelayIncrement));
+            commitDelayIncrement = value;
+        }
+    }
 
     Dictionary<string, string>? metadata;
+    TimeSpan commitDelayIncrement = TimeSpan.FromSeconds(2);
 }