MC-19014: QueueManagementTest caused flakiness during nightly build Integration test runs

Author: zakdma

app/code/Magento/MysqlMq/Model/ResourceModel/Queue.php

@@ -151,7 +151,7 @@ public function getMessages($queueName, $limit = null)
                 'queue_message_status.status IN (?)',
                 [QueueManagement::MESSAGE_STATUS_NEW, QueueManagement::MESSAGE_STATUS_RETRY_REQUIRED]
             )->where('queue.name = ?', $queueName)
-            ->order('queue_message_status.updated_at ASC');
+            ->order(['queue_message_status.updated_at ASC', 'queue_message_status.id ASC']);
 
         if ($limit) {
             $select->limit($limit);

app/code/Magento/MysqlMq/Test/Unit/Model/ResourceModel/QueueTest.php

@@ -206,7 +206,7 @@ public function testGetMessages()
             ]
         )->willReturnSelf();
         $select->expects($this->once())
-            ->method('order')->with('queue_message_status.updated_at ASC')->willReturnSelf();
+            ->method('order')->with(['queue_message_status.updated_at ASC', 'queue_message_status.id ASC'])->willReturnSelf();
         $select->expects($this->once())->method('limit')->with($limit)->willReturnSelf();
         $connection->expects($this->once())->method('fetchAll')->with($select)->willReturn($messages);
         $this->assertEquals($messages, $this->queue->getMessages($queueName, $limit));

dev/tests/integration/testsuite/Magento/MysqlMq/Model/QueueManagementTest.php

@@ -91,13 +91,17 @@ public function testAllFlows()
         $messages = $this->queueManagement->readMessages('queue2', 1);
         $message = array_shift($messages);
         $messageRelationId = $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID];
+        $this->queueManagement->pushToQueueForRetry($messageRelationId);
 
-        for ($i = 0; $i < 2; $i++) {
-            $this->assertEquals($i, $message[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
-            $this->queueManagement->pushToQueueForRetry($message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+        $retryMessage = null;
+        for ($i = 1; $i <= 3; $i++) {
             $messages = $this->queueManagement->readMessages('queue2', 1);
             $message = array_shift($messages);
-            $this->assertEquals($messageRelationId, $message[QueueManagement::MESSAGE_QUEUE_RELATION_ID]);
+            if ($message[QueueManagement::MESSAGE_QUEUE_RELATION_ID] == $messageRelationId) {
+                $retryMessage = $message;
+            }
         }
+        $this->assertNotNull($retryMessage, 'Made retry message not found in queue');
+        $this->assertEquals(1, $retryMessage[QueueManagement::MESSAGE_NUMBER_OF_TRIALS]);
     }
 }