fix silly SQS test

rebus-org · Aug 29, 2016 · 79db89f · 79db89f
1 parent cc39232
commit 79db89f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/Rebus.AmazonSQS.Tests/DeferMessageTest.cs b/Rebus.AmazonSQS.Tests/DeferMessageTest.cs
@@ -57,13 +57,13 @@ public async Task CanDeferMessage()
             });
 
             var bus = _configurer.Start();
+            var sendTime = DateTime.UtcNow;
 
             await bus.Defer(TimeSpan.FromSeconds(10), "hej med dig!");
 
             gotTheMessage.WaitOrDie(TimeSpan.FromSeconds(20));
 
-            var now = DateTime.UtcNow;
-            var elapsed = now - receiveTime;
+            var elapsed = receiveTime - sendTime;
 
             Assert.That(elapsed, Is.GreaterThan(TimeSpan.FromSeconds(8)));
         }

diff --git a/Rebus.AmazonSQS/AmazonSQSTransport.cs b/Rebus.AmazonSQS/AmazonSQSTransport.cs
@@ -234,11 +234,17 @@ async Task SendOutgoingMessages(ConcurrentQueue<OutgoingMessage> outgoingMessage
                                 var messageAttributes = CreateAttributesFromHeaders(headers);
                                 var delaySeconds = GetDelaySeconds(headers);
 
-                                return new SendMessageBatchRequestEntry(messageId, body)
+                                var entry = new SendMessageBatchRequestEntry(messageId, body)
                                 {
                                     MessageAttributes = messageAttributes,
-                                    DelaySeconds = delaySeconds,
                                 };
+
+                                if (delaySeconds != null)
+                                {
+                                    entry.DelaySeconds = delaySeconds.Value;
+                                }
+
+                                return entry;
                             })
                             .ToList();
 
@@ -256,10 +262,10 @@ async Task SendOutgoingMessages(ConcurrentQueue<OutgoingMessage> outgoingMessage
                 );
         }
 
-        static int GetDelaySeconds(IReadOnlyDictionary<string, string> headers)
+        static int? GetDelaySeconds(IReadOnlyDictionary<string, string> headers)
         {
             string deferUntilTime;
-            if (!headers.TryGetValue(Headers.DeferredUntil, out deferUntilTime)) return 0;
+            if (!headers.TryGetValue(Headers.DeferredUntil, out deferUntilTime)) return null;
 
             var deferUntilDateTimeOffset = deferUntilTime.ToDateTimeOffset();