ACP2E-3387: [Cloud] Magento: queue message has been deleted

Author: aplapana

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

@@ -27,7 +27,7 @@ class Queue extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
 
     /**
      * @param Context $context
-     * @param null $connectionName
+     * @param string|null $connectionName
      * @param int|null $chunkSize
      */
     public function __construct(Context $context, $connectionName = null, int $chunkSize = null)

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

@@ -285,8 +285,15 @@ function ($arg1, $arg2) use ($tableNames) {
         $connection->expects($this->once())->method('select')->willReturn($select);
         $select->expects($this->once())
             ->method('from')->with(['queue_message_status' => $tableNames[0]], ['message_id'])->willReturnSelf();
-        $select->expects($this->once())->method('where')
-            ->with('status = ?', QueueManagement::MESSAGE_STATUS_TO_BE_DELETED)
+        $select->expects($this->once())->method('joinLeft')
+            ->with(
+                ['message_status2' => 'queue_message_status'],
+                'queue_message_status.message_id = message_status2.message_id AND message_status2.status <> ' .
+                QueueManagement::MESSAGE_STATUS_TO_BE_DELETED,
+                []
+            )
+            ->willReturnSelf();
+        $select->expects($this->exactly(2))->method('where')
             ->willReturnSelf();
         $select->expects($this->once())->method('distinct')->willReturnSelf();
         $connection->expects($this->once())->method('fetchCol')->with($select)->willReturn([1, 2]);