From a5727bf64a682c279e6b04a76391d0476f11fea2 Mon Sep 17 00:00:00 2001
From: Waldemar Hummer <waldemar.hummer@gmail.com>
Date: Thu, 6 Apr 2017 21:09:58 +1000
Subject: [PATCH] fix SQS message polling to abort after wait_seconds_timeout

---
 moto/sqs/models.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/moto/sqs/models.py b/moto/sqs/models.py
index 9dff700e7..cedf03199 100644
--- a/moto/sqs/models.py
+++ b/moto/sqs/models.py
@@ -289,6 +289,10 @@ class SQSBackend(BaseBackend):
 
         # queue.messages only contains visible messages
         while True:
+
+            if result or (wait_seconds_timeout and unix_time() > polling_end):
+                break
+
             if len(queue.messages) == 0:
                 import time
                 time.sleep(0.001)
@@ -304,9 +308,6 @@ class SQSBackend(BaseBackend):
                 if len(result) >= count:
                     break
 
-            if result or unix_time() > polling_end:
-                break
-
         return result
 
     def delete_message(self, queue_name, receipt_handle):